Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29772f8a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 67fdfbdf

drivers/mmc/core/core.c

+0 −46
Original line number Diff line number Diff line
@@ -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

drivers/mmc/core/core.h

+0 −2
Original line number Diff line number Diff line
@@ -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 *);

drivers/mmc/core/sdio.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/mmc/host.h

+0 −3
Original line number Diff line number Diff line
@@ -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);