diff mbox series

pinctrl: renesas: rzg2l: Use devm_clk_get_enabled() helper

Message ID a4a586337d692f0ca396b80d275ba634eb419593.1690058500.git.christophe.jaillet@wanadoo.fr
State New
Headers
Series pinctrl: renesas: rzg2l: Use devm_clk_get_enabled() helper |

Commit Message

Christophe JAILLET July 22, 2023, 8:41 p.m. UTC 
  The devm_clk_get_enabled() helper:
   - calls devm_clk_get()
   - calls clk_prepare_enable() and registers what is needed in order to
     call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the need of a dedicated function used
with devm_add_action_or_reset().

While at it, use dev_err_probe() which filters -EPROBE_DEFER.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/pinctrl/renesas/pinctrl-rzg2l.c | 30 ++++---------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

Comments

Geert Uytterhoeven July 25, 2023, 7:49 a.m. UTC | #1 
Hi Christophe,

On Sat, Jul 22, 2023 at 10:42 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
> The devm_clk_get_enabled() helper:
>    - calls devm_clk_get()
>    - calls clk_prepare_enable() and registers what is needed in order to
>      call clk_disable_unprepare() when needed, as a managed resource.
>
> This simplifies the code and avoids the need of a dedicated function used
> with devm_add_action_or_reset().
>
> While at it, use dev_err_probe() which filters -EPROBE_DEFER.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Thanks for your patch!

> --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
> +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
> @@ -1471,11 +1471,6 @@ static int rzg2l_pinctrl_register(struct rzg2l_pinctrl *pctrl)
>         return 0;
>  }
>
> -static void rzg2l_pinctrl_clk_disable(void *data)
> -{
> -       clk_disable_unprepare(data);
> -}
> -
>  static int rzg2l_pinctrl_probe(struct platform_device *pdev)
>  {
>         struct rzg2l_pinctrl *pctrl;
> @@ -1501,33 +1496,16 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev)
>         if (IS_ERR(pctrl->base))
>                 return PTR_ERR(pctrl->base);
>
> -       pctrl->clk = devm_clk_get(pctrl->dev, NULL);
> -       if (IS_ERR(pctrl->clk)) {
> -               ret = PTR_ERR(pctrl->clk);
> -               dev_err(pctrl->dev, "failed to get GPIO clk : %i\n", ret);
> -               return ret;
> -       }
> +       pctrl->clk = devm_clk_get_enabled(pctrl->dev, NULL);

clk can become a local variable now.

> +       if (IS_ERR(pctrl->clk))
> +               return dev_err_probe(pctrl->dev, PTR_ERR(pctrl->clk),
> +                                    "failed to get GPIO clk\n");

failed to enable

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-clk-for-v6.6 with the above changes.
No need to resend.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 2f1a08210fd6..b2d05cfe5d8c 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -1471,11 +1471,6 @@  static int rzg2l_pinctrl_register(struct rzg2l_pinctrl *pctrl)
 	return 0;
 }
 
-static void rzg2l_pinctrl_clk_disable(void *data)
-{
-	clk_disable_unprepare(data);
-}
-
 static int rzg2l_pinctrl_probe(struct platform_device *pdev)
 {
 	struct rzg2l_pinctrl *pctrl;
@@ -1501,33 +1496,16 @@  static int rzg2l_pinctrl_probe(struct platform_device *pdev)
 	if (IS_ERR(pctrl->base))
 		return PTR_ERR(pctrl->base);
 
-	pctrl->clk = devm_clk_get(pctrl->dev, NULL);
-	if (IS_ERR(pctrl->clk)) {
-		ret = PTR_ERR(pctrl->clk);
-		dev_err(pctrl->dev, "failed to get GPIO clk : %i\n", ret);
-		return ret;
-	}
+	pctrl->clk = devm_clk_get_enabled(pctrl->dev, NULL);
+	if (IS_ERR(pctrl->clk))
+		return dev_err_probe(pctrl->dev, PTR_ERR(pctrl->clk),
+				     "failed to get GPIO clk\n");
 
 	spin_lock_init(&pctrl->lock);
 	spin_lock_init(&pctrl->bitmap_lock);
 
 	platform_set_drvdata(pdev, pctrl);
 
-	ret = clk_prepare_enable(pctrl->clk);
-	if (ret) {
-		dev_err(pctrl->dev, "failed to enable GPIO clk: %i\n", ret);
-		return ret;
-	}
-
-	ret = devm_add_action_or_reset(&pdev->dev, rzg2l_pinctrl_clk_disable,
-				       pctrl->clk);
-	if (ret) {
-		dev_err(pctrl->dev,
-			"failed to register GPIO clk disable action, %i\n",
-			ret);
-		return ret;
-	}
-
 	ret = rzg2l_pinctrl_register(pctrl);
 	if (ret)
 		return ret;