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_amd.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_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 3c760d0f4717..18381762908b 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -334,8 +334,10 @@ static struct scsi_host_template amd_sht = { | |||
334 | .slave_configure = ata_scsi_slave_config, | 334 | .slave_configure = ata_scsi_slave_config, |
335 | .slave_destroy = ata_scsi_slave_destroy, | 335 | .slave_destroy = ata_scsi_slave_destroy, |
336 | .bios_param = ata_std_bios_param, | 336 | .bios_param = ata_std_bios_param, |
337 | #ifdef CONFIG_PM | ||
337 | .resume = ata_scsi_device_resume, | 338 | .resume = ata_scsi_device_resume, |
338 | .suspend = ata_scsi_device_suspend, | 339 | .suspend = ata_scsi_device_suspend, |
340 | #endif | ||
339 | }; | 341 | }; |
340 | 342 | ||
341 | static struct ata_port_operations amd33_port_ops = { | 343 | static struct ata_port_operations amd33_port_ops = { |
@@ -663,6 +665,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
663 | return ata_pci_init_one(pdev, port_info, 2); | 665 | return ata_pci_init_one(pdev, port_info, 2); |
664 | } | 666 | } |
665 | 667 | ||
668 | #ifdef CONFIG_PM | ||
666 | static int amd_reinit_one(struct pci_dev *pdev) | 669 | static int amd_reinit_one(struct pci_dev *pdev) |
667 | { | 670 | { |
668 | if (pdev->vendor == PCI_VENDOR_ID_AMD) { | 671 | if (pdev->vendor == PCI_VENDOR_ID_AMD) { |
@@ -679,6 +682,7 @@ static int amd_reinit_one(struct pci_dev *pdev) | |||
679 | } | 682 | } |
680 | return ata_pci_device_resume(pdev); | 683 | return ata_pci_device_resume(pdev); |
681 | } | 684 | } |
685 | #endif | ||
682 | 686 | ||
683 | static const struct pci_device_id amd[] = { | 687 | static const struct pci_device_id amd[] = { |
684 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_COBRA_7401), 0 }, | 688 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_COBRA_7401), 0 }, |
@@ -708,8 +712,10 @@ static struct pci_driver amd_pci_driver = { | |||
708 | .id_table = amd, | 712 | .id_table = amd, |
709 | .probe = amd_init_one, | 713 | .probe = amd_init_one, |
710 | .remove = ata_pci_remove_one, | 714 | .remove = ata_pci_remove_one, |
715 | #ifdef CONFIG_PM | ||
711 | .suspend = ata_pci_device_suspend, | 716 | .suspend = ata_pci_device_suspend, |
712 | .resume = amd_reinit_one, | 717 | .resume = amd_reinit_one, |
718 | #endif | ||
713 | }; | 719 | }; |
714 | 720 | ||
715 | static int __init amd_init(void) | 721 | static int __init amd_init(void) |