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_hpt366.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_hpt366.c')
-rw-r--r-- | drivers/ata/pata_hpt366.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index 8e76f79689d3..cbc3de793d1d 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c | |||
@@ -386,7 +386,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
386 | return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0); | 386 | return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0); |
387 | } | 387 | } |
388 | 388 | ||
389 | #ifdef CONFIG_PM | 389 | #ifdef CONFIG_PM_SLEEP |
390 | static int hpt36x_reinit_one(struct pci_dev *dev) | 390 | static int hpt36x_reinit_one(struct pci_dev *dev) |
391 | { | 391 | { |
392 | struct ata_host *host = pci_get_drvdata(dev); | 392 | struct ata_host *host = pci_get_drvdata(dev); |
@@ -411,7 +411,7 @@ static struct pci_driver hpt36x_pci_driver = { | |||
411 | .id_table = hpt36x, | 411 | .id_table = hpt36x, |
412 | .probe = hpt36x_init_one, | 412 | .probe = hpt36x_init_one, |
413 | .remove = ata_pci_remove_one, | 413 | .remove = ata_pci_remove_one, |
414 | #ifdef CONFIG_PM | 414 | #ifdef CONFIG_PM_SLEEP |
415 | .suspend = ata_pci_device_suspend, | 415 | .suspend = ata_pci_device_suspend, |
416 | .resume = hpt36x_reinit_one, | 416 | .resume = hpt36x_reinit_one, |
417 | #endif | 417 | #endif |