mmc: core: Remove unnecessary check for the remove callback

For every bus_ops type the .remove callback always exist, thus there
are no need to check the existence of it, before we decide to call it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index e9a104b9e4d38742526a81a3201d064203f3efe7..d2ee2829b313c6552dc47b5def1020f9622a4284 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2483,9 +2483,7 @@ void mmc_stop_host(struct mmc_host *host)
        mmc_bus_get(host);
        if (host->bus_ops && !host->bus_dead) {
                /* Calling bus_ops->remove() with a claimed host can deadlock */
-               if (host->bus_ops->remove)
-                       host->bus_ops->remove(host);
-
+               host->bus_ops->remove(host);
                mmc_claim_host(host);
                mmc_detach_bus(host);
                mmc_power_off(host);
@@ -2638,8 +2636,7 @@ int mmc_suspend_host(struct mmc_host *host)
                         * bus_ops->remove() with a claimed host can
                         * deadlock.)
                         */
-                       if (host->bus_ops->remove)
-                               host->bus_ops->remove(host);
+                       host->bus_ops->remove(host);
                        mmc_claim_host(host);
                        mmc_detach_bus(host);
                        mmc_power_off(host);
@@ -2722,9 +2719,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
                        break;
 
                /* Calling bus_ops->remove() with a claimed host can deadlock */
-               if (host->bus_ops->remove)
-                       host->bus_ops->remove(host);
-
+               host->bus_ops->remove(host);
                mmc_claim_host(host);
                mmc_detach_bus(host);
                mmc_power_off(host);