diff options
author | Tejun Heo <htejun@gmail.com> | 2007-03-02 03:31:26 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:30:35 -0500 |
commit | 438ac6d5e3f8106a6bd1a5682c508d660294a85d (patch) | |
tree | 759aad55bb9850fe21709e12ca79cbdb3bf881f2 /drivers/ata/pata_serverworks.c | |
parent | b23ff24436c97fb26428f3a337faf189292cc307 (diff) |
libata: add missing CONFIG_PM in LLDs
Add missing #ifdef CONFIG_PM conditionals around all PM related parts
in libata LLDs.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_serverworks.c')
-rw-r--r-- | drivers/ata/pata_serverworks.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index dde7eb9f72bb..598eef810a74 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c | |||
@@ -319,8 +319,10 @@ static struct scsi_host_template serverworks_sht = { | |||
319 | .slave_configure = ata_scsi_slave_config, | 319 | .slave_configure = ata_scsi_slave_config, |
320 | .slave_destroy = ata_scsi_slave_destroy, | 320 | .slave_destroy = ata_scsi_slave_destroy, |
321 | .bios_param = ata_std_bios_param, | 321 | .bios_param = ata_std_bios_param, |
322 | #ifdef CONFIG_PM | ||
322 | .resume = ata_scsi_device_resume, | 323 | .resume = ata_scsi_device_resume, |
323 | .suspend = ata_scsi_device_suspend, | 324 | .suspend = ata_scsi_device_suspend, |
325 | #endif | ||
324 | }; | 326 | }; |
325 | 327 | ||
326 | static struct ata_port_operations serverworks_osb4_port_ops = { | 328 | static struct ata_port_operations serverworks_osb4_port_ops = { |
@@ -548,6 +550,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id | |||
548 | return ata_pci_init_one(pdev, port_info, ports); | 550 | return ata_pci_init_one(pdev, port_info, ports); |
549 | } | 551 | } |
550 | 552 | ||
553 | #ifdef CONFIG_PM | ||
551 | static int serverworks_reinit_one(struct pci_dev *pdev) | 554 | static int serverworks_reinit_one(struct pci_dev *pdev) |
552 | { | 555 | { |
553 | /* Force master latency timer to 64 PCI clocks */ | 556 | /* Force master latency timer to 64 PCI clocks */ |
@@ -571,6 +574,7 @@ static int serverworks_reinit_one(struct pci_dev *pdev) | |||
571 | } | 574 | } |
572 | return ata_pci_device_resume(pdev); | 575 | return ata_pci_device_resume(pdev); |
573 | } | 576 | } |
577 | #endif | ||
574 | 578 | ||
575 | static const struct pci_device_id serverworks[] = { | 579 | static const struct pci_device_id serverworks[] = { |
576 | { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0}, | 580 | { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0}, |
@@ -587,8 +591,10 @@ static struct pci_driver serverworks_pci_driver = { | |||
587 | .id_table = serverworks, | 591 | .id_table = serverworks, |
588 | .probe = serverworks_init_one, | 592 | .probe = serverworks_init_one, |
589 | .remove = ata_pci_remove_one, | 593 | .remove = ata_pci_remove_one, |
594 | #ifdef CONFIG_PM | ||
590 | .suspend = ata_pci_device_suspend, | 595 | .suspend = ata_pci_device_suspend, |
591 | .resume = serverworks_reinit_one, | 596 | .resume = serverworks_reinit_one, |
597 | #endif | ||
592 | }; | 598 | }; |
593 | 599 | ||
594 | static int __init serverworks_init(void) | 600 | static int __init serverworks_init(void) |