mmc: omap-hsmmc: remove redundant null check
authorXu Wang <vulab@iscas.ac.cn>
Thu, 3 Sep 2020 08:48:25 +0000 (08:48 +0000)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 7 Sep 2020 07:21:40 +0000 (09:21 +0200)
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>
Link: https://lore.kernel.org/r/20200903084825.85616-1-vulab@iscas.ac.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/omap_hsmmc.c

index 37b8740513f5fa3586738bdd1003042d5b2d61cc..d02983e23ed16450744d1e37d503f49fcb012fbe 100644 (file)
@@ -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 @@ err_irq:
        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);