aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ata_piix.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2014-05-07 11:17:44 -0400
committerTejun Heo <tj@kernel.org>2014-05-09 22:37:49 -0400
commit58eb8cd565af4a104395e3c10443951c1f73dafe (patch)
tree127ce4daca1f66218d2b72712c6b4e50ecc740bd /drivers/ata/ata_piix.c
parenta3464ed2f14d19ba923930f7c0c284499d64eb5b (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/ata_piix.c')
-rw-r--r--drivers/ata/ata_piix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 6334c8d7c3f1..893e30e9a9ef 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -830,7 +830,7 @@ static bool piix_irq_check(struct ata_port *ap)
830 return ap->ops->bmdma_status(ap) & ATA_DMA_INTR; 830 return ap->ops->bmdma_status(ap) & ATA_DMA_INTR;
831} 831}
832 832
833#ifdef CONFIG_PM 833#ifdef CONFIG_PM_SLEEP
834static int piix_broken_suspend(void) 834static int piix_broken_suspend(void)
835{ 835{
836 static const struct dmi_system_id sysids[] = { 836 static const struct dmi_system_id sysids[] = {
@@ -1767,7 +1767,7 @@ static struct pci_driver piix_pci_driver = {
1767 .id_table = piix_pci_tbl, 1767 .id_table = piix_pci_tbl,
1768 .probe = piix_init_one, 1768 .probe = piix_init_one,
1769 .remove = piix_remove_one, 1769 .remove = piix_remove_one,
1770#ifdef CONFIG_PM 1770#ifdef CONFIG_PM_SLEEP
1771 .suspend = piix_pci_device_suspend, 1771 .suspend = piix_pci_device_suspend,
1772 .resume = piix_pci_device_resume, 1772 .resume = piix_pci_device_resume,
1773#endif 1773#endif