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_cmd64x.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_cmd64x.c')
-rw-r--r-- | drivers/ata/pata_cmd64x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 6bca3505b9e9..13ca5883285b 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
@@ -487,7 +487,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
487 | return ata_pci_bmdma_init_one(pdev, ppi, &cmd64x_sht, NULL, 0); | 487 | return ata_pci_bmdma_init_one(pdev, ppi, &cmd64x_sht, NULL, 0); |
488 | } | 488 | } |
489 | 489 | ||
490 | #ifdef CONFIG_PM | 490 | #ifdef CONFIG_PM_SLEEP |
491 | static int cmd64x_reinit_one(struct pci_dev *pdev) | 491 | static int cmd64x_reinit_one(struct pci_dev *pdev) |
492 | { | 492 | { |
493 | struct ata_host *host = pci_get_drvdata(pdev); | 493 | struct ata_host *host = pci_get_drvdata(pdev); |
@@ -518,7 +518,7 @@ static struct pci_driver cmd64x_pci_driver = { | |||
518 | .id_table = cmd64x, | 518 | .id_table = cmd64x, |
519 | .probe = cmd64x_init_one, | 519 | .probe = cmd64x_init_one, |
520 | .remove = ata_pci_remove_one, | 520 | .remove = ata_pci_remove_one, |
521 | #ifdef CONFIG_PM | 521 | #ifdef CONFIG_PM_SLEEP |
522 | .suspend = ata_pci_device_suspend, | 522 | .suspend = ata_pci_device_suspend, |
523 | .resume = cmd64x_reinit_one, | 523 | .resume = cmd64x_reinit_one, |
524 | #endif | 524 | #endif |