Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-23 13:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

mmc: via-sdmmc: use generic power management

Browse Source 
Drivers using legacy PM have to manage PCI states and device's PM states
themselves. They also need to take care of configuration registers.

With improved and powerful support of generic PM, PCI Core takes care of
above mentioned, device-independent, jobs.

This driver makes use of PCI helper functions like
pci_save/restore_state(), pci_enable/disable_device(),
pci_enable_wake() and pci_set_power_state() and to do required operations.
In generic mode, they are no longer needed.

Change function parameter in both .suspend() and .resume() to
"struct device*" type. Use dev_get_drvdata() to get drv data.

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Link: https://lore.kernel.org/r/20200720142603.577323-1-vaibhavgupta40@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Vaibhav Gupta 2020-07-20 19:56:04 +05:30 committed by Ulf Hansson
parent c4e5e22b3b
commit 0d776e5bed
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/mmc/host/via-sdmmc.c
View File

@ -1220,9 +1220,7 @@ static void via_sd_remove(struct pci_dev *pcidev)
pci_name(pcidev), (int)pcidev->vendor, (int)pcidev->device); pci_name(pcidev), (int)pcidev->vendor, (int)pcidev->device);
} }
#ifdef CONFIG_PM static void __maybe_unused via_init_sdc_pm(struct via_crdr_mmc_host *host)
static void via_init_sdc_pm(struct via_crdr_mmc_host *host)
{ {
struct sdhcreg *pm_sdhcreg; struct sdhcreg *pm_sdhcreg;
void __iomem *addrbase; void __iomem *addrbase;
@ -1256,30 +1254,27 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host)
via_print_sdchc(host); via_print_sdchc(host);
} }
static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state) static int __maybe_unused via_sd_suspend(struct device *dev)
{ {
struct via_crdr_mmc_host *host; struct via_crdr_mmc_host *host;
host = pci_get_drvdata(pcidev); host = dev_get_drvdata(dev);
via_save_pcictrlreg(host); via_save_pcictrlreg(host);
via_save_sdcreg(host); via_save_sdcreg(host);
pci_save_state(pcidev); device_wakeup_enable(dev);
pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);
pci_disable_device(pcidev);
pci_set_power_state(pcidev, pci_choose_state(pcidev, state));
return 0; return 0;
} }
static int via_sd_resume(struct pci_dev *pcidev) static int __maybe_unused via_sd_resume(struct device *dev)
{ {
struct via_crdr_mmc_host *sdhost; struct via_crdr_mmc_host *sdhost;
int ret = 0; int ret = 0;
u8 gatt; u8 gatt;
sdhost = pci_get_drvdata(pcidev); sdhost = dev_get_drvdata(dev);
gatt = VIA_CRDR_PCICLKGATT_PAD_PWRON; gatt = VIA_CRDR_PCICLKGATT_PAD_PWRON;
if (sdhost->power == MMC_VDD_165_195) if (sdhost->power == MMC_VDD_165_195)
@ -1294,32 +1289,20 @@ static int via_sd_resume(struct pci_dev *pcidev)
msleep(100); msleep(100);
pci_set_power_state(pcidev, PCI_D0);
pci_restore_state(pcidev);
ret = pci_enable_device(pcidev);
if (ret)
return ret;
via_restore_pcictrlreg(sdhost); via_restore_pcictrlreg(sdhost);
via_init_sdc_pm(sdhost); via_init_sdc_pm(sdhost);
return ret; return ret;
} }
#else /* CONFIG_PM */ static SIMPLE_DEV_PM_OPS(via_sd_pm_ops, via_sd_suspend, via_sd_resume);
#define via_sd_suspend NULL
#define via_sd_resume NULL
#endif /* CONFIG_PM */
static struct pci_driver via_sd_driver = { static struct pci_driver via_sd_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = via_ids, .id_table = via_ids,
.probe = via_sd_probe, .probe = via_sd_probe,
.remove = via_sd_remove, .remove = via_sd_remove,
.suspend = via_sd_suspend, .driver.pm = &via_sd_pm_ops,
.resume = via_sd_resume,
}; };
module_pci_driver(via_sd_driver); module_pci_driver(via_sd_driver);