Message ID | 5ef585a3d7bee42bac5be0e40efcfbc6e75adfff.1702400947.git.u.kleine-koenig@pengutronix.de (mailing list archive) |
---|---|
State | Rejected, archived |
Headers | show |
Series | clk: Make clk_rate_exclusive_get() return void | expand |
On Tue, 12 Dec 2023 18:26:38 +0100 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > clk_rate_exclusive_get() returns 0 unconditionally. So remove error > handling. This prepares making clk_rate_exclusive_get() return void. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Looks alright to me: Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > drivers/devfreq/sun8i-a33-mbus.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/devfreq/sun8i-a33-mbus.c b/drivers/devfreq/sun8i-a33-mbus.c > index 13d32213139f..bbc577556944 100644 > --- a/drivers/devfreq/sun8i-a33-mbus.c > +++ b/drivers/devfreq/sun8i-a33-mbus.c > @@ -381,18 +381,10 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) > "failed to enable bus clock\n"); > > /* Lock the DRAM clock rate to keep priv->nominal_bw in sync. */ > - ret = clk_rate_exclusive_get(priv->clk_dram); > - if (ret) { > - err = "failed to lock dram clock rate\n"; > - goto err_disable_bus; > - } > + clk_rate_exclusive_get(priv->clk_dram); > > /* Lock the MBUS clock rate to keep MBUS_TMR_PERIOD in sync. */ > - ret = clk_rate_exclusive_get(priv->clk_mbus); > - if (ret) { > - err = "failed to lock mbus clock rate\n"; > - goto err_unlock_dram; > - } > + clk_rate_exclusive_get(priv->clk_mbus); > > priv->gov_data.upthreshold = 10; > priv->gov_data.downdifferential = 5; > @@ -450,9 +442,7 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) > dev_pm_opp_remove_all_dynamic(dev); > err_unlock_mbus: > clk_rate_exclusive_put(priv->clk_mbus); > -err_unlock_dram: > clk_rate_exclusive_put(priv->clk_dram); > -err_disable_bus: > clk_disable_unprepare(priv->clk_bus); > > return dev_err_probe(dev, ret, err);
diff --git a/drivers/devfreq/sun8i-a33-mbus.c b/drivers/devfreq/sun8i-a33-mbus.c index 13d32213139f..bbc577556944 100644 --- a/drivers/devfreq/sun8i-a33-mbus.c +++ b/drivers/devfreq/sun8i-a33-mbus.c @@ -381,18 +381,10 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) "failed to enable bus clock\n"); /* Lock the DRAM clock rate to keep priv->nominal_bw in sync. */ - ret = clk_rate_exclusive_get(priv->clk_dram); - if (ret) { - err = "failed to lock dram clock rate\n"; - goto err_disable_bus; - } + clk_rate_exclusive_get(priv->clk_dram); /* Lock the MBUS clock rate to keep MBUS_TMR_PERIOD in sync. */ - ret = clk_rate_exclusive_get(priv->clk_mbus); - if (ret) { - err = "failed to lock mbus clock rate\n"; - goto err_unlock_dram; - } + clk_rate_exclusive_get(priv->clk_mbus); priv->gov_data.upthreshold = 10; priv->gov_data.downdifferential = 5; @@ -450,9 +442,7 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) dev_pm_opp_remove_all_dynamic(dev); err_unlock_mbus: clk_rate_exclusive_put(priv->clk_mbus); -err_unlock_dram: clk_rate_exclusive_put(priv->clk_dram); -err_disable_bus: clk_disable_unprepare(priv->clk_bus); return dev_err_probe(dev, ret, err);
clk_rate_exclusive_get() returns 0 unconditionally. So remove error handling. This prepares making clk_rate_exclusive_get() return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/devfreq/sun8i-a33-mbus.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)