Skip to contentSkip to conversation

thermal: amlogic: Use dev_err_probe()

PATCH Applied [email protected] 4 participants 4 messages Mar 24, 2023 – Apr 1, 2023

Subsystems (3)
Arm/Amlogic Meson SoC support Thermal Thermal driver for Amlogic SoCs
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 thermal: amlogic: Use dev_err_probe()

From: Ye Xingchen <[email protected]>

Replace the open-code with dev_err_probe() to simplify the code.

Signed-off-by Ye Xingchen <[email protected]>
---
 drivers/thermal/amlogic_thermal.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/thermal/amlogic_thermal.c +2 -5
index 4bf36386462f..3abc2dcef408 100644
@@ -262,11 +262,8 @@ static int amlogic_thermal_probe(struct platform_device *pdev)
 		return PTR_ERR(pdata->regmap);
 
 	pdata->clk = devm_clk_get(dev, NULL);
-	if (IS_ERR(pdata->clk)) {
-		if (PTR_ERR(pdata->clk) != -EPROBE_DEFER)
-			dev_err(dev, "failed to get clock\n");
-		return PTR_ERR(pdata->clk);
-	}
+	if (IS_ERR(pdata->clk))
+		return dev_err_probe(dev, PTR_ERR(pdata->clk), "failed to get clock\n");
 
 	pdata->sec_ao_map = syscon_regmap_lookup_by_phandle
 		(pdev->dev.of_node, "amlogic,ao-secure");
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · On 24/03/2023 03:20, [email protected] wrote:

From: Ye Xingchen <[email protected]>

Replace the open-code with dev_err_probe() to simplify the code.

Signed-off-by Ye Xingchen <[email protected]>
---
  drivers/thermal/amlogic_thermal.c | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
drivers/thermal/amlogic_thermal.c +0 -0
index 4bf36386462f..3abc2dcef408 100644
@@ -262,11 +262,8 @@ static int amlogic_thermal_probe(struct platform_device *pdev)
  		return PTR_ERR(pdata->regmap);
 
  	pdata->clk = devm_clk_get(dev, NULL);

drivers/thermal/amlogic_thermal.c static int amlogic_thermal_probe(struct platform_device *pdev) · line 269

Quoted 10 lines
drivers/thermal/amlogic_thermal.c +2 -5
-	if (IS_ERR(pdata->clk)) {
-		if (PTR_ERR(pdata->clk) != -EPROBE_DEFER)
-			dev_err(dev, "failed to get clock\n");
-		return PTR_ERR(pdata->clk);
-	}
+	if (IS_ERR(pdata->clk))
+		return dev_err_probe(dev, PTR_ERR(pdata->clk), "failed to get clock\n");
 
  	pdata->sec_ao_map = syscon_regmap_lookup_by_phandle
  		(pdev->dev.of_node, "amlogic,ao-secure");
Reviewed-by Neil Armstrong <[email protected]>
Applied
#3 lore raw
In reply to [email protected]
Quoted 6 lines · On 24/03/2023 03:20, [email protected] wrote:

From: Ye Xingchen <[email protected]>

Replace the open-code with dev_err_probe() to simplify the code.

Signed-off-by Ye Xingchen <[email protected]>

---

Applied, thanks

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog