Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -19
+5 -19
drivers/reset/reset-uniphier-glue.c
··· 35 35 clk_bulk_disable_unprepare(priv->data->nclks, priv->clk); 36 36 } 37 37 38 - static void uniphier_rst_assert(void *_priv) 39 - { 40 - struct uniphier_glue_reset_priv *priv = _priv; 41 - 42 - reset_control_bulk_assert(priv->data->nrsts, priv->rst); 43 - } 44 - 45 38 static int uniphier_glue_reset_probe(struct platform_device *pdev) 46 39 { 47 40 struct device *dev = &pdev->dev; ··· 61 68 if (ret) 62 69 return ret; 63 70 64 - for (i = 0; i < priv->data->nrsts; i++) 65 - priv->rst[i].id = priv->data->reset_names[i]; 66 - ret = devm_reset_control_bulk_get_shared(dev, priv->data->nrsts, 67 - priv->rst); 68 - if (ret) 69 - return ret; 70 - 71 71 ret = clk_bulk_prepare_enable(priv->data->nclks, priv->clk); 72 72 if (ret) 73 73 return ret; ··· 69 83 if (ret) 70 84 return ret; 71 85 72 - ret = reset_control_bulk_deassert(priv->data->nrsts, priv->rst); 73 - if (ret) 74 - return ret; 75 - 76 - ret = devm_add_action_or_reset(dev, uniphier_rst_assert, priv); 86 + for (i = 0; i < priv->data->nrsts; i++) 87 + priv->rst[i].id = priv->data->reset_names[i]; 88 + ret = devm_reset_control_bulk_get_shared_deasserted(dev, 89 + priv->data->nrsts, 90 + priv->rst); 77 91 if (ret) 78 92 return ret; 79 93