Skip to contentSkip to conversation

devfreq: rk3399_dmc: Simplify with dev_err_probe()

PATCH Applied Krzysztof Kozlowski 3 participants 4 messages Aug 28, 2020 – Feb 28, 2021 Device frequency (devfreq)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devfreq: rk3399_dmc: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

---
 drivers/devfreq/rk3399_dmc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/devfreq/rk3399_dmc.c +6 -14
index 027769e39f9b..35b3542f1f7b 100644
@@ -324,22 +324,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 	mutex_init(&data->lock);
 
 	data->vdd_center = devm_regulator_get(dev, "center");
-	if (IS_ERR(data->vdd_center)) {
-		if (PTR_ERR(data->vdd_center) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(dev, "Cannot get the regulator \"center\"\n");
-		return PTR_ERR(data->vdd_center);
-	}
+	if (IS_ERR(data->vdd_center))
+		return dev_err_probe(dev, PTR_ERR(data->vdd_center),
+				     "Cannot get the regulator \"center\"\n");
 
 	data->dmc_clk = devm_clk_get(dev, "dmc_clk");
-	if (IS_ERR(data->dmc_clk)) {
-		if (PTR_ERR(data->dmc_clk) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(dev, "Cannot get the clk dmc_clk\n");
-		return PTR_ERR(data->dmc_clk);
-	}
+	if (IS_ERR(data->dmc_clk))
+		return dev_err_probe(dev, PTR_ERR(data->dmc_clk),
+				     "Cannot get the clk dmc_clk\n");
 
 	data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
 	if (IS_ERR(data->edev))
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 43 lines · Krzysztof Kozlowski

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

---
 drivers/devfreq/rk3399_dmc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/devfreq/rk3399_dmc.c +6 -15
index 027769e39f9b..35b3542f1f7b 100644
@@ -324,22 +324,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
        mutex_init(&data->lock);
 
        data->vdd_center = devm_regulator_get(dev, "center");
-       if (IS_ERR(data->vdd_center)) {
-               if (PTR_ERR(data->vdd_center) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the regulator \"center\"\n");
-               return PTR_ERR(data->vdd_center);
-       }
+       if (IS_ERR(data->vdd_center))
+               return dev_err_probe(dev, PTR_ERR(data->vdd_center),
+                                    "Cannot get the regulator \"center\"\n");
 
        data->dmc_clk = devm_clk_get(dev, "dmc_clk");
-       if (IS_ERR(data->dmc_clk)) {
-               if (PTR_ERR(data->dmc_clk) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the clk dmc_clk\n");
-               return PTR_ERR(data->dmc_clk);
-       }
+       if (IS_ERR(data->dmc_clk))
+               return dev_err_probe(dev, PTR_ERR(data->dmc_clk),
+                                    "Cannot get the clk dmc_clk\n");
 
        data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
        if (IS_ERR(data->edev))
--
Quoted 2 lines

2.17.1

Applied it. Thanks.

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
#2 lore raw
Quoted 42 lines · Chanwoo Choi
Quoted 40 lines · Krzysztof Kozlowski

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

---
 drivers/devfreq/rk3399_dmc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/devfreq/rk3399_dmc.c +6 -14
index 027769e39f9b..35b3542f1f7b 100644
@@ -324,22 +324,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
        mutex_init(&data->lock);
 
        data->vdd_center = devm_regulator_get(dev, "center");
-       if (IS_ERR(data->vdd_center)) {
-               if (PTR_ERR(data->vdd_center) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the regulator \"center\"\n");
-               return PTR_ERR(data->vdd_center);
-       }
+       if (IS_ERR(data->vdd_center))
+               return dev_err_probe(dev, PTR_ERR(data->vdd_center),
+                                    "Cannot get the regulator \"center\"\n");
 
        data->dmc_clk = devm_clk_get(dev, "dmc_clk");
-       if (IS_ERR(data->dmc_clk)) {
-               if (PTR_ERR(data->dmc_clk) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the clk dmc_clk\n");
-               return PTR_ERR(data->dmc_clk);
-       }
+       if (IS_ERR(data->dmc_clk))
+               return dev_err_probe(dev, PTR_ERR(data->dmc_clk),
+                                    "Cannot get the clk dmc_clk\n");
 
Quoted 7 lines
Quoted 5 lines
drivers/devfreq/rk3399_dmc.c +0 -1
        data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
        if (IS_ERR(data->edev))
--

2.17.1

Applied it. Thanks.

Hi Chanwoo,

Do you know what happened with this patch? You replied that it is applied but I cannot find it in the Linus' or next trees.

Best regards,
Krzysztof

#3 lore raw
Quoted 51 lines · Krzysztof Kozlowski
Quoted 42 lines · Chanwoo Choi
Quoted 40 lines · Krzysztof Kozlowski

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.

---
  drivers/devfreq/rk3399_dmc.c | 20 ++++++--------------
  1 file changed, 6 insertions(+), 14 deletions(-)
drivers/devfreq/rk3399_dmc.c +6 -14
index 027769e39f9b..35b3542f1f7b 100644
@@ -324,22 +324,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
         mutex_init(&data->lock);
 
         data->vdd_center = devm_regulator_get(dev, "center");
-       if (IS_ERR(data->vdd_center)) {
-               if (PTR_ERR(data->vdd_center) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the regulator \"center\"\n");
-               return PTR_ERR(data->vdd_center);
-       }
+       if (IS_ERR(data->vdd_center))
+               return dev_err_probe(dev, PTR_ERR(data->vdd_center),
+                                    "Cannot get the regulator \"center\"\n");
 
         data->dmc_clk = devm_clk_get(dev, "dmc_clk");
-       if (IS_ERR(data->dmc_clk)) {
-               if (PTR_ERR(data->dmc_clk) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-
-               dev_err(dev, "Cannot get the clk dmc_clk\n");
-               return PTR_ERR(data->dmc_clk);
-       }
+       if (IS_ERR(data->dmc_clk))
+               return dev_err_probe(dev, PTR_ERR(data->dmc_clk),
+                                    "Cannot get the clk dmc_clk\n");
 
Quoted 7 lines
Quoted 5 lines
drivers/devfreq/rk3399_dmc.c +0 -1
         data->edev = devfreq_event_get_edev_by_phandle(dev, 0);
         if (IS_ERR(data->edev))
--

2.17.1

Applied it. Thanks.

Quoted 5 lines

Hi Chanwoo,

Do you know what happened with this patch? You replied that it is applied but I cannot find it in the Linus' or next trees.

Hi Krzysztof,

There was some my mistake. I'm sorry.
I applied it again to next branch.

Signature · 3 lines
Best Regards,
Samsung Electronics
Chanwoo Choi