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

Commit 1a13f8fa authored by Matt Fleming's avatar Matt Fleming Committed by Linus Torvalds
Browse files

mmc: remove the "state" argument to mmc_suspend_host() 



Even though many mmc host drivers pass a pm_message_t argument to
mmc_suspend_host() that argument isn't used the by MMC core.  As host
drivers are converted to dev_pm_ops they'll have to construct
pm_message_t's (as they won't be passed by the PM subsystem any more) just
to appease the mmc suspend interface.

We might as well just delete the unused paramter.

Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Acked-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Acked-by: default avatarMichal Miroslaw <mirq-linux@rere.qmqm.pl&gt;ZZ>
Acked-by: default avatarSascha Sommer <saschasommer@freenet.de>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a791daa1

drivers/mmc/core/core.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1252,9 +1252,8 @@ EXPORT_SYMBOL(mmc_card_can_sleep); 
/**

/**

 *	mmc_suspend_host - suspend a host

 *	mmc_suspend_host - suspend a host

 *	@host: mmc host

 *	@host: mmc host

 *	@state: suspend mode (PM_SUSPEND_xxx)

 */

 */

int mmc_suspend_host(struct mmc_host *host, pm_message_t state)

int mmc_suspend_host(struct mmc_host *host)

{

{

	int err = 0;

	int err = 0;

drivers/mmc/host/at91_mci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1157,7 +1157,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state) 
		enable_irq_wake(host->board->det_pin);

		enable_irq_wake(host->board->det_pin);





	if (mmc)

	if (mmc)

		ret = mmc_suspend_host(mmc, state);

		ret = mmc_suspend_host(mmc);





	return ret;

	return ret;

}

}

drivers/mmc/host/au1xmmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) 
	struct au1xmmc_host *host = platform_get_drvdata(pdev);

	struct au1xmmc_host *host = platform_get_drvdata(pdev);

	int ret;

	int ret;





	ret = mmc_suspend_host(host->mmc, state);

	ret = mmc_suspend_host(host->mmc);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/mmc/host/bfin_sdh.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -576,7 +576,7 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state) 
	int ret = 0;

	int ret = 0;





	if (mmc)

	if (mmc)

		ret = mmc_suspend_host(mmc, state);

		ret = mmc_suspend_host(mmc);





	bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);

	bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);

	peripheral_free_list(drv_data->pin_req);

	peripheral_free_list(drv_data->pin_req);

drivers/mmc/host/cb710-mmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -675,7 +675,7 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) 
	struct mmc_host *mmc = cb710_slot_to_mmc(slot);

	struct mmc_host *mmc = cb710_slot_to_mmc(slot);

	int err;

	int err;





	err = mmc_suspend_host(mmc, state);

	err = mmc_suspend_host(mmc);

	if (err)

	if (err)

		return err;

		return err;