Skip to content

Commit

Permalink
[ARM] pxa: update pxamci.c to use 'struct dev_pm_ops'
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Mike Rapoport authored and Eric Miao committed Sep 10, 2009
1 parent 2ba9fd0 commit 33264f9
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/mmc/host/pxamci.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,40 +804,43 @@ static int pxamci_remove(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int pxamci_suspend(struct platform_device *dev, pm_message_t state)
static int pxamci_suspend(struct device *dev)
{
struct mmc_host *mmc = platform_get_drvdata(dev);
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;

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

return ret;
}

static int pxamci_resume(struct platform_device *dev)
static int pxamci_resume(struct device *dev)
{
struct mmc_host *mmc = platform_get_drvdata(dev);
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0;

if (mmc)
ret = mmc_resume_host(mmc);

return ret;
}
#else
#define pxamci_suspend NULL
#define pxamci_resume NULL

static struct dev_pm_ops pxamci_pm_ops = {
.suspend = pxamci_suspend,
.resume = pxamci_resume,
};
#endif

static struct platform_driver pxamci_driver = {
.probe = pxamci_probe,
.remove = pxamci_remove,
.suspend = pxamci_suspend,
.resume = pxamci_resume,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pxamci_pm_ops,
#endif
},
};

Expand Down

0 comments on commit 33264f9

Please sign in to comment.