Re: [PATCH 2/3] mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check

[Adrian Hunter]

On 18/05/2026 14:00, Artem Shimko wrote:
> The clk_disable_unprepare() function has internal protection against
> ERR_PTR and NULL pointers (IS_ERR_OR_NULL). Remove the redundant
> IS_ERR() check for bus_clk in dwcmshc_suspend() and in the error
> path of dwcmshc_resume() to simplify the code.
> 
> Note that the clk_prepare_enable() call in dwcmshc_resume() must retain
> its IS_ERR() check because clk_prepare() only handles NULL pointers,
> not ERR_PTR.
> 
> No functional change intended.
> 
> Signed-off-by: Artem Shimko <a.shimko.dev@xxxxxxxxx>

Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>

> ---
>  drivers/mmc/host/sdhci-of-dwcmshc.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
> index 8c3ca47c8060..29bb46783ee5 100644
> --- a/drivers/mmc/host/sdhci-of-dwcmshc.c
> +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
> @@ -2564,8 +2564,7 @@ static int dwcmshc_suspend(struct device *dev)
>  		return ret;
>  
>  	clk_disable_unprepare(pltfm_host->clk);
> -	if (!IS_ERR(priv->bus_clk))
> -		clk_disable_unprepare(priv->bus_clk);
> +	clk_disable_unprepare(priv->bus_clk);
>  
>  	clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks);
>  
> @@ -2608,8 +2607,7 @@ static int dwcmshc_resume(struct device *dev)
>  disable_other_clks:
>  	clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks);
>  disable_bus_clk:
> -	if (!IS_ERR(priv->bus_clk))
> -		clk_disable_unprepare(priv->bus_clk);
> +	clk_disable_unprepare(priv->bus_clk);
>  disable_clk:
>  	clk_disable_unprepare(pltfm_host->clk);
>  	return ret;