diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2014-05-07 11:17:44 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-05-09 22:37:49 -0400 |
commit | 58eb8cd565af4a104395e3c10443951c1f73dafe (patch) | |
tree | 127ce4daca1f66218d2b72712c6b4e50ecc740bd /drivers/ata/pata_amd.c | |
parent | a3464ed2f14d19ba923930f7c0c284499d64eb5b (diff) |
ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
This patch fixes host drivers to use CONFIG_PM_SLEEP instead of CONFIG_PM
where applicable. Benefits of this change:
* unused code is not being compiled in for CONFIG_PM=y, CONFIG_PM_SLEEP=n
and CONFIG_PM_RUNTIME=y configurations
* easier transition to use struct dev_pm_ops and SIMPLE_DEV_PM_OPS() in
the future
* more consistent code (there are host drivers which are using the correct
CONFIG_PM_SLEEP checks already)
The patch leaves the core libata code and ->port_[suspend,resume] support
in sata_[inic162x,nv,sil24].c alone for now.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 1206fa6b62ca..8d4d959a821c 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -574,7 +574,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
574 | return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0); | 574 | return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0); |
575 | } | 575 | } |
576 | 576 | ||
577 | #ifdef CONFIG_PM | 577 | #ifdef CONFIG_PM_SLEEP |
578 | static int amd_reinit_one(struct pci_dev *pdev) | 578 | static int amd_reinit_one(struct pci_dev *pdev) |
579 | { | 579 | { |
580 | struct ata_host *host = pci_get_drvdata(pdev); | 580 | struct ata_host *host = pci_get_drvdata(pdev); |
@@ -625,7 +625,7 @@ static struct pci_driver amd_pci_driver = { | |||
625 | .id_table = amd, | 625 | .id_table = amd, |
626 | .probe = amd_init_one, | 626 | .probe = amd_init_one, |
627 | .remove = ata_pci_remove_one, | 627 | .remove = ata_pci_remove_one, |
628 | #ifdef CONFIG_PM | 628 | #ifdef CONFIG_PM_SLEEP |
629 | .suspend = ata_pci_device_suspend, | 629 | .suspend = ata_pci_device_suspend, |
630 | .resume = amd_reinit_one, | 630 | .resume = amd_reinit_one, |
631 | #endif | 631 | #endif |