lkml.org 
[lkml]   [2020]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] mmc: host: omap-hsmmc: remove redundant null check
On Thu, 3 Sep 2020 at 10:48, Xu Wang <vulab@iscas.ac.cn> wrote:
>
> Because clk_disable_unprepare already checked NULL clock
> parameter, so the additional checks are unnecessary, just remove them.
>
> Signed-off-by: Xu Wang <vulab@iscas.ac.cn>

Applied for next, thanks!

Kind regards
Uffe


> ---
> drivers/mmc/host/omap_hsmmc.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 37b8740513f5..d02983e23ed1 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1114,8 +1114,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
> int ret;
>
> /* Disable the clocks */
> - if (host->dbclk)
> - clk_disable_unprepare(host->dbclk);
> + clk_disable_unprepare(host->dbclk);
>
> /* Turn the power off */
> ret = omap_hsmmc_set_power(host, 0);
> @@ -1123,8 +1122,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
> /* Turn the power ON with given VDD 1.8 or 3.0v */
> if (!ret)
> ret = omap_hsmmc_set_power(host, 1);
> - if (host->dbclk)
> - clk_prepare_enable(host->dbclk);
> + clk_prepare_enable(host->dbclk);
>
> if (ret != 0)
> goto err;
> @@ -2014,8 +2012,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
> pm_runtime_dont_use_autosuspend(host->dev);
> pm_runtime_put_sync(host->dev);
> pm_runtime_disable(host->dev);
> - if (host->dbclk)
> - clk_disable_unprepare(host->dbclk);
> + clk_disable_unprepare(host->dbclk);
> err1:
> mmc_free_host(mmc);
> err:
> @@ -2037,8 +2034,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
> pm_runtime_put_sync(host->dev);
> pm_runtime_disable(host->dev);
> device_init_wakeup(&pdev->dev, false);
> - if (host->dbclk)
> - clk_disable_unprepare(host->dbclk);
> + clk_disable_unprepare(host->dbclk);
>
> mmc_free_host(host->mmc);
>
> @@ -2063,8 +2059,7 @@ static int omap_hsmmc_suspend(struct device *dev)
> OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
> }
>
> - if (host->dbclk)
> - clk_disable_unprepare(host->dbclk);
> + clk_disable_unprepare(host->dbclk);
>
> pm_runtime_put_sync(host->dev);
> return 0;
> @@ -2080,8 +2075,7 @@ static int omap_hsmmc_resume(struct device *dev)
>
> pm_runtime_get_sync(host->dev);
>
> - if (host->dbclk)
> - clk_prepare_enable(host->dbclk);
> + clk_prepare_enable(host->dbclk);
>
> if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER))
> omap_hsmmc_conf_bus_power(host);
> --
> 2.17.1
>

\
 
 \ /
  Last update: 2020-09-07 12:08    [W:0.037 / U:7.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site