[PATCH] mmc:rtsx_pci_sdmmc change driver to use dev_pm_ops infrastructure
STALE4794d
From: Shuah Khan <hidden>
Date: 2013-08-10 15:22:58
Also in:
lkml
Subsystem:
multimedia card (mmc), secure digital (sd) and sdio subsystem, the rest · Maintainers:
Ulf Hansson, Linus Torvalds
Change rtsx_pci_sdmmc platform driver to register pm ops using dev_pm_ops instead of legacy pm_ops infrastructure. Signed-off-by: Shuah Khan <redacted> --- drivers/mmc/host/rtsx_pci_sdmmc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 82a35b9..fc52f28 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c@@ -1166,9 +1166,9 @@ static const struct mmc_host_ops realtek_pci_sdmmc_ops = { }; #ifdef CONFIG_PM -static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev, - pm_message_t state) +static int rtsx_pci_sdmmc_suspend(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); struct mmc_host *mmc = host->mmc; int err;
@@ -1182,8 +1182,9 @@ static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev, return 0; } -static int rtsx_pci_sdmmc_resume(struct platform_device *pdev) +static int rtsx_pci_sdmmc_resume(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); struct mmc_host *mmc = host->mmc;
@@ -1331,15 +1332,17 @@ static struct platform_device_id rtsx_pci_sdmmc_ids[] = { }; MODULE_DEVICE_TABLE(platform, rtsx_pci_sdmmc_ids); +static SIMPLE_DEV_PM_OPS(rtsx_pci_sdmmc_dev_pm_ops, rtsx_pci_sdmmc_suspend, + rtsx_pci_sdmmc_resume); + static struct platform_driver rtsx_pci_sdmmc_driver = { .probe = rtsx_pci_sdmmc_drv_probe, .remove = rtsx_pci_sdmmc_drv_remove, .id_table = rtsx_pci_sdmmc_ids, - .suspend = rtsx_pci_sdmmc_suspend, - .resume = rtsx_pci_sdmmc_resume, .driver = { .owner = THIS_MODULE, .name = DRV_NAME_RTSX_PCI_SDMMC, + .pm = &rtsx_pci_sdmmc_dev_pm_ops, }, }; module_platform_driver(rtsx_pci_sdmmc_driver);
--
1.7.10.4