diff mbox series

PM: opp: simplify with dev_err_probe()

Message ID 20220408111052.381603-1-krzysztof.kozlowski@linaro.org
State Accepted
Commit 543256d239b4156bf5817049fb92138f6661f15f
Headers show
Series PM: opp: simplify with dev_err_probe() | expand

Commit Message

Krzysztof Kozlowski April 8, 2022, 11:10 a.m. UTC
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/opp/core.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Comments

Viresh Kumar April 11, 2022, 2:53 a.m. UTC | #1
On 08-04-22, 13:10, Krzysztof Kozlowski wrote:
> Common pattern of handling deferred probe can be simplified with
> dev_err_probe().  Less code and the error value gets printed.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  drivers/opp/core.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/opp/core.c b/drivers/opp/core.c
> index 0b5357b9d342..ed72df835f8c 100644
> --- a/drivers/opp/core.c
> +++ b/drivers/opp/core.c
> @@ -2030,10 +2030,9 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
>  	for (i = 0; i < count; i++) {
>  		reg = regulator_get_optional(dev, names[i]);
>  		if (IS_ERR(reg)) {
> -			ret = PTR_ERR(reg);
> -			if (ret != -EPROBE_DEFER)
> -				dev_err(dev, "%s: no regulator (%s) found: %d\n",
> -					__func__, names[i], ret);
> +			ret = dev_err_probe(dev, PTR_ERR(reg),
> +					    "%s: no regulator (%s) found\n",
> +					    __func__, names[i]);
>  			goto free_regulators;
>  		}
>  
> @@ -2179,11 +2178,8 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)
>  	/* Find clk for the device */
>  	opp_table->clk = clk_get(dev, name);
>  	if (IS_ERR(opp_table->clk)) {
> -		ret = PTR_ERR(opp_table->clk);
> -		if (ret != -EPROBE_DEFER) {
> -			dev_err(dev, "%s: Couldn't find clock: %d\n", __func__,
> -				ret);
> -		}
> +		ret = dev_err_probe(dev, PTR_ERR(opp_table->clk),
> +				    "%s: Couldn't find clock\n", __func__);
>  		goto err;
>  	}

Applied. Thanks.
diff mbox series

Patch

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 0b5357b9d342..ed72df835f8c 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -2030,10 +2030,9 @@  struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
 	for (i = 0; i < count; i++) {
 		reg = regulator_get_optional(dev, names[i]);
 		if (IS_ERR(reg)) {
-			ret = PTR_ERR(reg);
-			if (ret != -EPROBE_DEFER)
-				dev_err(dev, "%s: no regulator (%s) found: %d\n",
-					__func__, names[i], ret);
+			ret = dev_err_probe(dev, PTR_ERR(reg),
+					    "%s: no regulator (%s) found\n",
+					    __func__, names[i]);
 			goto free_regulators;
 		}
 
@@ -2179,11 +2178,8 @@  struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)
 	/* Find clk for the device */
 	opp_table->clk = clk_get(dev, name);
 	if (IS_ERR(opp_table->clk)) {
-		ret = PTR_ERR(opp_table->clk);
-		if (ret != -EPROBE_DEFER) {
-			dev_err(dev, "%s: Couldn't find clock: %d\n", __func__,
-				ret);
-		}
+		ret = dev_err_probe(dev, PTR_ERR(opp_table->clk),
+				    "%s: Couldn't find clock\n", __func__);
 		goto err;
 	}