Skip to content

Commit

Permalink
mmc: core: Drop the unused mmc_power_save|restore_host()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
storulf committed Jul 16, 2018
1 parent 67fdfbd commit 29772f8
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 52 deletions.
46 changes: 0 additions & 46 deletions drivers/mmc/core/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/mmc/core/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
1 change: 0 additions & 1 deletion drivers/mmc/core/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 0 additions & 3 deletions include/linux/mmc/host.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 29772f8

Please sign in to comment.