Skip to content

Commit

Permalink
mmc: remove the "state" argument to mmc_suspend_host()
Browse files Browse the repository at this point in the history 
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: Matt Fleming <matt@console-pimps.org>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Acked-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>ZZ
Acked-by: Sascha Sommer <saschasommer@freenet.de>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Matt Fleming authored and Linus Torvalds committed May 27, 2010
1 parent a791daa commit 1a13f8f
Show file tree
Hide file tree
Showing 23 changed files with 23 additions and 26 deletions.
3 changes: 1 addition & 2 deletions drivers/mmc/core/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1252,9 +1252,8 @@ EXPORT_SYMBOL(mmc_card_can_sleep);
/**
* mmc_suspend_host - suspend a 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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/at91_mci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
enable_irq_wake(host->board->det_pin);

if (mmc)
ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/au1xmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state)
struct au1xmmc_host *host = platform_get_drvdata(pdev);
int ret;

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/bfin_sdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state)
int ret = 0;

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);
peripheral_free_list(drv_data->pin_req);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/cb710-mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
int err;

err = mmc_suspend_host(mmc, state);
err = mmc_suspend_host(mmc);
if (err)
return err;

Expand Down
3 changes: 1 addition & 2 deletions drivers/mmc/host/davinci_mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,11 +1337,10 @@ static int davinci_mmcsd_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct mmc_davinci_host *host = platform_get_drvdata(pdev);
struct pm_message msg = { PM_EVENT_SUSPEND };
int ret;

mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc, msg);
ret = mmc_suspend_host(host->mmc);
if (!ret) {
writel(0, host->base + DAVINCI_MMCIM);
mmc_davinci_reset_ctrl(host, 1);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/imxmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ static int imxmci_suspend(struct platform_device *dev, pm_message_t state)
int ret = 0;

if (mmc)
ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/mmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ static int mmci_suspend(struct amba_device *dev, pm_message_t state)
if (mmc) {
struct mmci_host *host = mmc_priv(mmc);

ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);
if (ret == 0)
writel(0, host->base + MMCIMASK0);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/msm_sdcc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
disable_irq(host->stat_irq);

if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
rc = mmc_suspend_host(mmc, state);
rc = mmc_suspend_host(mmc);
if (!rc)
msmsdcc_writel(host, 0, MMCIMASK0);
if (host->clks_on)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/mvsdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ static int mvsd_suspend(struct platform_device *dev, pm_message_t state)
int ret = 0;

if (mmc)
ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/mxcmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ static int mxcmci_suspend(struct platform_device *dev, pm_message_t state)
int ret = 0;

if (mmc)
ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);

return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ static int mmc_omap_suspend(struct platform_device *pdev, pm_message_t mesg)
struct mmc_omap_slot *slot;

slot = host->slots[i];
ret = mmc_suspend_host(slot->mmc, mesg);
ret = mmc_suspend_host(slot->mmc);
if (ret < 0) {
while (--i >= 0) {
slot = host->slots[i];
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/omap_hsmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ static int omap_hsmmc_suspend(struct device *dev)
}
cancel_work_sync(&host->mmc_carddetect_work);
mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc, state);
ret = mmc_suspend_host(host->mmc);
if (ret == 0) {
omap_hsmmc_disable_irq(host);
OMAP_HSMMC_WRITE(host->base, HCTL,
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/pxamci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ static int pxamci_suspend(struct device *dev)
int ret = 0;

if (mmc)
ret = mmc_suspend_host(mmc, PMSG_SUSPEND);
ret = mmc_suspend_host(mmc);

return ret;
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/mmc/host/s3cmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1881,9 +1881,8 @@ MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids);
static int s3cmci_suspend(struct device *dev)
{
struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
struct pm_message event = { PM_EVENT_SUSPEND };

return mmc_suspend_host(mmc, event);
return mmc_suspend_host(mmc);
}

static int s3cmci_resume(struct device *dev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-of-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int sdhci_of_suspend(struct of_device *ofdev, pm_message_t state)
{
struct sdhci_host *host = dev_get_drvdata(&ofdev->dev);

return mmc_suspend_host(host->mmc, state);
return mmc_suspend_host(host->mmc);
}

static int sdhci_of_resume(struct of_device *ofdev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)

sdhci_disable_card_detection(host);

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

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdricoh_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ static int sdricoh_pcmcia_suspend(struct pcmcia_device *link)
{
struct mmc_host *mmc = link->priv;
dev_dbg(&link->dev, "suspend\n");
mmc_suspend_host(mmc, PMSG_SUSPEND);
mmc_suspend_host(mmc);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/tifm_sd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ static void tifm_sd_remove(struct tifm_dev *sock)

static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state)
{
return mmc_suspend_host(tifm_get_drvdata(sock), state);
return mmc_suspend_host(tifm_get_drvdata(sock));
}

static int tifm_sd_resume(struct tifm_dev *sock)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/tmio_mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)
struct mmc_host *mmc = platform_get_drvdata(dev);
int ret;

ret = mmc_suspend_host(mmc, state);
ret = mmc_suspend_host(mmc);

/* Tell MFD core it can disable us now.*/
if (!ret && cell->disable)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/via-sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state)
via_save_pcictrlreg(host);
via_save_sdcreg(host);

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

pci_save_state(pcidev);
pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/wbsd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,7 @@ static int wbsd_suspend(struct wbsd_host *host, pm_message_t state)
{
BUG_ON(host == NULL);

return mmc_suspend_host(host->mmc, state);
return mmc_suspend_host(host->mmc);
}

static int wbsd_resume(struct wbsd_host *host)
Expand Down
2 changes: 1 addition & 1 deletion include/linux/mmc/host.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ 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))

extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_suspend_host(struct mmc_host *);
extern int mmc_resume_host(struct mmc_host *);

extern void mmc_power_save_host(struct mmc_host *host);
Expand Down

0 comments on commit 1a13f8f

Please sign in to comment.