[PATCH -next 0/4] cpufreq: Switch to use dev_err_probe() helper

[PATCH -next 0/4] cpufreq: Switch to use dev_err_probe() helper

[Yang Yingliang]

This patchset is trying to replace dev_err() with dev_err_probe() in
the probe path. With this helper, it prints the error name instead of
printing error code which is more readable and sets the defer probe
reason which can be checked later through debugfs, and it makes error
path more clean.

Yang Yingliang (4):
  cpufreq: dt: Switch to use dev_err_probe() helper
  cpufreq: imx6q: Switch to use dev_err_probe() helper
  cpufreq: qcom-nvmem: Switch to use dev_err_probe() helper
  cpufreq: sun50i: Switch to use dev_err_probe() helper

 drivers/cpufreq/cpufreq-dt.c           | 6 ++----
 drivers/cpufreq/imx6q-cpufreq.c        | 4 +---
 drivers/cpufreq/qcom-cpufreq-nvmem.c   | 7 ++-----
 drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 +++------
 4 files changed, 8 insertions(+), 18 deletions(-)

-- 
2.25.1

[PATCH -next 1/4] cpufreq: dt: Switch to use dev_err_probe() helper

[Yang Yingliang]

In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs. It's more simple in error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/cpufreq/cpufreq-dt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index d69d13a26414..4aec4b2a5225 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -222,10 +222,8 @@ static int dt_cpufreq_early_init(struct device *dev, int cpu)
 	if (reg_name[0]) {
 		priv->opp_token = dev_pm_opp_set_regulators(cpu_dev, reg_name);
 		if (priv->opp_token < 0) {
-			ret = priv->opp_token;
-			if (ret != -EPROBE_DEFER)
-				dev_err(cpu_dev, "failed to set regulators: %d\n",
-					ret);
+			ret = dev_err_probe(cpu_dev, priv->opp_token,
+					    "failed to set regulators\n");
 			goto free_cpumask;
 		}
 	}
-- 
2.25.1

[PATCH -next 2/4] cpufreq: imx6q: Switch to use dev_err_probe() helper

[Yang Yingliang]

In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs. It's more simple in error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/cpufreq/imx6q-cpufreq.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 90beb26ed34e..ad4ce8493144 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -396,9 +396,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 		ret = imx6q_opp_check_speed_grading(cpu_dev);
 	}
 	if (ret) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(cpu_dev, "failed to read ocotp: %d\n",
-				ret);
+		dev_err_probe(cpu_dev, ret, "failed to read ocotp\n");
 		goto out_free_opp;
 	}
 
-- 
2.25.1

[PATCH -next 3/4] cpufreq: qcom-nvmem: Switch to use dev_err_probe() helper

[Yang Yingliang]

In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs. It's more simple in error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
index 863548f59c3e..8bf2808f0181 100644
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
@@ -295,11 +295,8 @@ static int qcom_cpufreq_probe(struct platform_device *pdev)
 	if (drv->data->get_version) {
 		speedbin_nvmem = of_nvmem_cell_get(np, NULL);
 		if (IS_ERR(speedbin_nvmem)) {
-			if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)
-				dev_err(cpu_dev,
-					"Could not get nvmem cell: %ld\n",
-					PTR_ERR(speedbin_nvmem));
-			ret = PTR_ERR(speedbin_nvmem);
+			ret = dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),
+					    "Could not get nvmem cell\n");
 			goto free_drv;
 		}
 
-- 
2.25.1

[PATCH -next 4/4] cpufreq: sun50i: Switch to use dev_err_probe() helper

[Yang Yingliang]

In the probe path, convert pr_err() to dev_err_probe() which will
check if error code is -EPROBE_DEFER and prints the error name.
It also sets the defer probe reason which can be checked later
through debugfs. It's more simple in error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
index a4922580ce06..1583a370da39 100644
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
@@ -56,12 +56,9 @@ static int sun50i_cpufreq_get_efuse(u32 *versions)
 
 	speedbin_nvmem = of_nvmem_cell_get(np, NULL);
 	of_node_put(np);
-	if (IS_ERR(speedbin_nvmem)) {
-		if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)
-			pr_err("Could not get nvmem cell: %ld\n",
-			       PTR_ERR(speedbin_nvmem));
-		return PTR_ERR(speedbin_nvmem);
-	}
+	if (IS_ERR(speedbin_nvmem))
+		return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),
+				     "Could not get nvmem cell\n");
 
 	speedbin = nvmem_cell_read(speedbin_nvmem, &len);
 	nvmem_cell_put(speedbin_nvmem);
-- 
2.25.1

Re: [PATCH -next 0/4] cpufreq: Switch to use dev_err_probe() helper

[Viresh Kumar]

On 27-09-22, 23:40, Yang Yingliang wrote:
> This patchset is trying to replace dev_err() with dev_err_probe() in
> the probe path. With this helper, it prints the error name instead of
> printing error code which is more readable and sets the defer probe
> reason which can be checked later through debugfs, and it makes error
> path more clean.
> 
> Yang Yingliang (4):
>   cpufreq: dt: Switch to use dev_err_probe() helper
>   cpufreq: imx6q: Switch to use dev_err_probe() helper
>   cpufreq: qcom-nvmem: Switch to use dev_err_probe() helper
>   cpufreq: sun50i: Switch to use dev_err_probe() helper
> 
>  drivers/cpufreq/cpufreq-dt.c           | 6 ++----
>  drivers/cpufreq/imx6q-cpufreq.c        | 4 +---
>  drivers/cpufreq/qcom-cpufreq-nvmem.c   | 7 ++-----
>  drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 +++------
>  4 files changed, 8 insertions(+), 18 deletions(-)

Applied. Thanks.

-- 
viresh