redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: 7221/1: mmc: mmci: Change from using legacy suspend

Browse source 
This patch switch from using the legacy suspend/resume
to the new way of registering PM callbacks. No functional
change is done.

Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ulf Hansson 2011-12-13 16:59:34 +01:00 committed by Russell King
parent bc521818e2
commit 48fa700388
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/mmc/host/mmci.c
View file

@ -1456,10 +1456,11 @@ static int __devexit mmci_remove(struct amba_device *dev)
return 0;
}
#ifdef CONFIG_PM
static int mmci_suspend(struct amba_device *dev, pm_message_t state)
#ifdef CONFIG_SUSPEND
static int mmci_suspend(struct device *dev)
{
struct mmc_host *mmc = amba_get_drvdata(dev);
struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;
if (mmc) {
@ -1473,9 +1474,10 @@ static int mmci_suspend(struct amba_device *dev, pm_message_t state)
return ret;
}
static int mmci_resume(struct amba_device *dev)
static int mmci_resume(struct device *dev)
{
struct mmc_host *mmc = amba_get_drvdata(dev);
struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;
if (mmc) {
@ -1488,11 +1490,12 @@ static int mmci_resume(struct amba_device *dev)
return ret;
}
#else
#define mmci_suspend NULL
#define mmci_resume NULL
#endif
static const struct dev_pm_ops mmci_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume)
};
static struct amba_id mmci_ids[] = {
{
.id = 0x00041180,
@ -1538,11 +1541,10 @@ MODULE_DEVICE_TABLE(amba, mmci_ids);
static struct amba_driver mmci_driver = {
.drv = {
.name = DRIVER_NAME,
.pm = &mmci_dev_pm_ops,
},
.probe = mmci_probe,
.remove = __devexit_p(mmci_remove),
.suspend = mmci_suspend,
.resume = mmci_resume,
.id_table = mmci_ids,
};