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/acard-ahci.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/acard-ahci.c')
-rw-r--r-- | drivers/ata/acard-ahci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c index b51605ac5974..0cd7c7a39e5b 100644 --- a/drivers/ata/acard-ahci.c +++ b/drivers/ata/acard-ahci.c | |||
@@ -77,7 +77,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc); | |||
77 | static int acard_ahci_port_start(struct ata_port *ap); | 77 | static int acard_ahci_port_start(struct ata_port *ap); |
78 | static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); | 78 | static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); |
79 | 79 | ||
80 | #ifdef CONFIG_PM | 80 | #ifdef CONFIG_PM_SLEEP |
81 | static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); | 81 | static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); |
82 | static int acard_ahci_pci_device_resume(struct pci_dev *pdev); | 82 | static int acard_ahci_pci_device_resume(struct pci_dev *pdev); |
83 | #endif | 83 | #endif |
@@ -118,13 +118,13 @@ static struct pci_driver acard_ahci_pci_driver = { | |||
118 | .id_table = acard_ahci_pci_tbl, | 118 | .id_table = acard_ahci_pci_tbl, |
119 | .probe = acard_ahci_init_one, | 119 | .probe = acard_ahci_init_one, |
120 | .remove = ata_pci_remove_one, | 120 | .remove = ata_pci_remove_one, |
121 | #ifdef CONFIG_PM | 121 | #ifdef CONFIG_PM_SLEEP |
122 | .suspend = acard_ahci_pci_device_suspend, | 122 | .suspend = acard_ahci_pci_device_suspend, |
123 | .resume = acard_ahci_pci_device_resume, | 123 | .resume = acard_ahci_pci_device_resume, |
124 | #endif | 124 | #endif |
125 | }; | 125 | }; |
126 | 126 | ||
127 | #ifdef CONFIG_PM | 127 | #ifdef CONFIG_PM_SLEEP |
128 | static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) | 128 | static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) |
129 | { | 129 | { |
130 | struct ata_host *host = pci_get_drvdata(pdev); | 130 | struct ata_host *host = pci_get_drvdata(pdev); |