aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_cmd640.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/pata_cmd640.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/pata_cmd640.c')
-rw-r--r--drivers/ata/pata_cmd640.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 57f1be64dbf2..c47caa807fa9 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -231,7 +231,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
231 return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL, 0); 231 return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL, 0);
232} 232}
233 233
234#ifdef CONFIG_PM 234#ifdef CONFIG_PM_SLEEP
235static int cmd640_reinit_one(struct pci_dev *pdev) 235static int cmd640_reinit_one(struct pci_dev *pdev)
236{ 236{
237 struct ata_host *host = pci_get_drvdata(pdev); 237 struct ata_host *host = pci_get_drvdata(pdev);
@@ -256,7 +256,7 @@ static struct pci_driver cmd640_pci_driver = {
256 .id_table = cmd640, 256 .id_table = cmd640,
257 .probe = cmd640_init_one, 257 .probe = cmd640_init_one,
258 .remove = ata_pci_remove_one, 258 .remove = ata_pci_remove_one,
259#ifdef CONFIG_PM 259#ifdef CONFIG_PM_SLEEP
260 .suspend = ata_pci_device_suspend, 260 .suspend = ata_pci_device_suspend,
261 .resume = cmd640_reinit_one, 261 .resume = cmd640_reinit_one,
262#endif 262#endif