reset: uniphier-glue: Use devm_reset_control_bulk_get_shared_deasserted()

Replace the pattern devm_reset_control_bulk_get_shared() /
reset_control_bulk_deassert() / devm_add_action_or_reset()
with devm_reset_control_bulk_get_shared_deasserted() for
some reduction in boilerplate.

Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20240925-reset-get-deasserted-v2-3-b3601bbd0458@pengutronix.de
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c
index 5f9f2f7..a2a262b 100644 (file)
--- a/drivers/reset/reset-uniphier-glue.c
+++ b/drivers/reset/reset-uniphier-glue.c
@@ -35,13 +35,6 @@ static void uniphier_clk_disable(void *_priv)
        clk_bulk_disable_unprepare(priv->data->nclks, priv->clk);
 }
 
-static void uniphier_rst_assert(void *_priv)
-{
-       struct uniphier_glue_reset_priv *priv = _priv;
-
-       reset_control_bulk_assert(priv->data->nrsts, priv->rst);
-}
-
 static int uniphier_glue_reset_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -68,13 +61,6 @@ static int uniphier_glue_reset_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       for (i = 0; i < priv->data->nrsts; i++)
-               priv->rst[i].id = priv->data->reset_names[i];
-       ret = devm_reset_control_bulk_get_shared(dev, priv->data->nrsts,
-                                                priv->rst);
-       if (ret)
-               return ret;
-
        ret = clk_bulk_prepare_enable(priv->data->nclks, priv->clk);
        if (ret)
                return ret;
@@ -83,11 +69,11 @@ static int uniphier_glue_reset_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = reset_control_bulk_deassert(priv->data->nrsts, priv->rst);
-       if (ret)
-               return ret;
-
-       ret = devm_add_action_or_reset(dev, uniphier_rst_assert, priv);
+       for (i = 0; i < priv->data->nrsts; i++)
+               priv->rst[i].id = priv->data->reset_names[i];
+       ret = devm_reset_control_bulk_get_shared_deasserted(dev,
+                                                           priv->data->nrsts,
+                                                           priv->rst);
        if (ret)
                return ret;