[PATCH] clk: s2mps11: Simplify s2mps11_clk_probe unwind paths

[PATCH] clk: s2mps11: Simplify s2mps11_clk_probe unwind paths

[Axel Lin]

The devm_clk_unregister() in probe error paths are not necessary as it will be
automatically called when probe fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/clk/clk-s2mps11.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index f2f62a1b..aeaa61c 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -210,7 +210,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
 					sizeof(struct clk_lookup), GFP_KERNEL);
 		if (!s2mps11_clk->lookup) {
 			ret = -ENOMEM;
-			goto err_lup;
+			goto err_reg;
 		}
 
 		s2mps11_clk->lookup->con_id = s2mps11_name(s2mps11_clk);
@@ -231,16 +231,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, s2mps11_clks);
 
 	return ret;
-err_lup:
-	devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
+
 err_reg:
-	while (s2mps11_clk > s2mps11_clks) {
-		if (s2mps11_clk->lookup) {
-			clkdev_drop(s2mps11_clk->lookup);
-			devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
-		}
-		s2mps11_clk--;
-	}
+	while (--i >= 0)
+		clkdev_drop(s2mps11_clks[i].lookup);
 
 	return ret;
 }
-- 
1.8.3.2

Re: [PATCH] clk: s2mps11: Simplify s2mps11_clk_probe unwind paths

[Krzysztof Kozlowski]

On nie, 2014-05-18 at 23:51 +0800, Axel Lin wrote:
> The devm_clk_unregister() in probe error paths are not necessary as it will be
> automatically called when probe fails.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
>  drivers/clk/clk-s2mps11.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof



> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
> index f2f62a1b..aeaa61c 100644
> --- a/drivers/clk/clk-s2mps11.c
> +++ b/drivers/clk/clk-s2mps11.c
> @@ -210,7 +210,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>  					sizeof(struct clk_lookup), GFP_KERNEL);
>  		if (!s2mps11_clk->lookup) {
>  			ret = -ENOMEM;
> -			goto err_lup;
> +			goto err_reg;
>  		}
>  
>  		s2mps11_clk->lookup->con_id = s2mps11_name(s2mps11_clk);
> @@ -231,16 +231,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, s2mps11_clks);
>  
>  	return ret;
> -err_lup:
> -	devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
> +
>  err_reg:
> -	while (s2mps11_clk > s2mps11_clks) {
> -		if (s2mps11_clk->lookup) {
> -			clkdev_drop(s2mps11_clk->lookup);
> -			devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
> -		}
> -		s2mps11_clk--;
> -	}
> +	while (--i >= 0)
> +		clkdev_drop(s2mps11_clks[i].lookup);
>  
>  	return ret;
>  }