mmc: core: Drop the unused mmc_power_save|restore_host()

The last user of mmc_power_save|restore_host() APIs is gone, hence let's
drop them. Drop also the corresponding bus_ops callback,
->power_save|restore() as those becomes redundant.

Cc: Tony Lindgren <tony@atomide.com>
Cc: Eyal Reizer <eyalreizer@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 6780c2b81050c47097e58daa0b81c9db61402ca4..50a5c340307b8c33b9ed6ad72eafeb8afa227174 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2716,52 +2716,6 @@ void mmc_stop_host(struct mmc_host *host)
        mmc_release_host(host);
 }
 
-int mmc_power_save_host(struct mmc_host *host)
-{
-       int ret = 0;
-
-       pr_debug("%s: %s: powering down\n", mmc_hostname(host), __func__);
-
-       mmc_bus_get(host);
-
-       if (!host->bus_ops || host->bus_dead) {
-               mmc_bus_put(host);
-               return -EINVAL;
-       }
-
-       if (host->bus_ops->power_save)
-               ret = host->bus_ops->power_save(host);
-
-       mmc_bus_put(host);
-
-       mmc_power_off(host);
-
-       return ret;
-}
-EXPORT_SYMBOL(mmc_power_save_host);
-
-int mmc_power_restore_host(struct mmc_host *host)
-{
-       int ret;
-
-       pr_debug("%s: %s: powering up\n", mmc_hostname(host), __func__);
-
-       mmc_bus_get(host);
-
-       if (!host->bus_ops || host->bus_dead) {
-               mmc_bus_put(host);
-               return -EINVAL;
-       }
-
-       mmc_power_up(host, host->card->ocr);
-       ret = host->bus_ops->power_restore(host);
-
-       mmc_bus_put(host);
-
-       return ret;
-}
-EXPORT_SYMBOL(mmc_power_restore_host);
-
 #ifdef CONFIG_PM_SLEEP
 /* Do the card removal on suspend if card is assumed removeable
  * Do that in pm notifier while userspace isn't yet frozen, so we will be able

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 9d8f09ac0821ad7cd112880a6fc1587fda7c08e5..087ba68b292099cbf07cb8ad00ea547967443593 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -28,8 +28,6 @@ struct mmc_bus_ops {
        int (*resume)(struct mmc_host *);
        int (*runtime_suspend)(struct mmc_host *);
        int (*runtime_resume)(struct mmc_host *);
-       int (*power_save)(struct mmc_host *);
-       int (*power_restore)(struct mmc_host *);
        int (*alive)(struct mmc_host *);
        int (*shutdown)(struct mmc_host *);
        int (*hw_reset)(struct mmc_host *);

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index a86490dbca70705fb4022014201a8ac42b0f04da..d8e17ea6126de8339beddd776702e5aa3c0691d5 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -1076,7 +1076,6 @@ static const struct mmc_bus_ops mmc_sdio_ops = {
        .resume = mmc_sdio_resume,
        .runtime_suspend = mmc_sdio_runtime_suspend,
        .runtime_resume = mmc_sdio_runtime_resume,
-       .power_restore = mmc_sdio_power_restore,
        .alive = mmc_sdio_alive,
        .hw_reset = mmc_sdio_hw_reset,
        .sw_reset = mmc_sdio_sw_reset,

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index a39e2925c84cfe970ba3d85629ef577686bdbd3d..beed7121c7818b74f9e70bd701c34ea8ee55d914 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -481,9 +481,6 @@ static inline void *mmc_priv(struct mmc_host *host)
 #define mmc_classdev(x)        (&(x)->class_dev)
 #define mmc_hostname(x)        (dev_name(&(x)->class_dev))
 
-int mmc_power_save_host(struct mmc_host *host);
-int mmc_power_restore_host(struct mmc_host *host);
-
 void mmc_detect_change(struct mmc_host *, unsigned long delay);
 void mmc_request_done(struct mmc_host *, struct mmc_request *);
 void mmc_command_done(struct mmc_host *host, struct mmc_request *mrq);