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_rz1000.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_rz1000.c')
-rw-r--r-- | drivers/ata/pata_rz1000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c index caedc90855b2..b3ec18c6bcc6 100644 --- a/drivers/ata/pata_rz1000.c +++ b/drivers/ata/pata_rz1000.c | |||
@@ -101,7 +101,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en | |||
101 | return -ENODEV; | 101 | return -ENODEV; |
102 | } | 102 | } |
103 | 103 | ||
104 | #ifdef CONFIG_PM | 104 | #ifdef CONFIG_PM_SLEEP |
105 | static int rz1000_reinit_one(struct pci_dev *pdev) | 105 | static int rz1000_reinit_one(struct pci_dev *pdev) |
106 | { | 106 | { |
107 | struct ata_host *host = pci_get_drvdata(pdev); | 107 | struct ata_host *host = pci_get_drvdata(pdev); |
@@ -133,7 +133,7 @@ static struct pci_driver rz1000_pci_driver = { | |||
133 | .id_table = pata_rz1000, | 133 | .id_table = pata_rz1000, |
134 | .probe = rz1000_init_one, | 134 | .probe = rz1000_init_one, |
135 | .remove = ata_pci_remove_one, | 135 | .remove = ata_pci_remove_one, |
136 | #ifdef CONFIG_PM | 136 | #ifdef CONFIG_PM_SLEEP |
137 | .suspend = ata_pci_device_suspend, | 137 | .suspend = ata_pci_device_suspend, |
138 | .resume = rz1000_reinit_one, | 138 | .resume = rz1000_reinit_one, |
139 | #endif | 139 | #endif |