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/sata_inic162x.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/sata_inic162x.c')
-rw-r--r-- | drivers/ata/sata_inic162x.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 31b636fac98e..3193a603d1a1 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
@@ -135,8 +135,10 @@ static struct scsi_host_template inic_sht = { | |||
135 | .slave_configure = inic_slave_config, | 135 | .slave_configure = inic_slave_config, |
136 | .slave_destroy = ata_scsi_slave_destroy, | 136 | .slave_destroy = ata_scsi_slave_destroy, |
137 | .bios_param = ata_std_bios_param, | 137 | .bios_param = ata_std_bios_param, |
138 | #ifdef CONFIG_PM | ||
138 | .suspend = ata_scsi_device_suspend, | 139 | .suspend = ata_scsi_device_suspend, |
139 | .resume = ata_scsi_device_resume, | 140 | .resume = ata_scsi_device_resume, |
141 | #endif | ||
140 | }; | 142 | }; |
141 | 143 | ||
142 | static const int scr_map[] = { | 144 | static const int scr_map[] = { |
@@ -632,6 +634,7 @@ static int init_controller(void __iomem *mmio_base, u16 hctl) | |||
632 | return 0; | 634 | return 0; |
633 | } | 635 | } |
634 | 636 | ||
637 | #ifdef CONFIG_PM | ||
635 | static int inic_pci_device_resume(struct pci_dev *pdev) | 638 | static int inic_pci_device_resume(struct pci_dev *pdev) |
636 | { | 639 | { |
637 | struct ata_host *host = dev_get_drvdata(&pdev->dev); | 640 | struct ata_host *host = dev_get_drvdata(&pdev->dev); |
@@ -642,7 +645,6 @@ static int inic_pci_device_resume(struct pci_dev *pdev) | |||
642 | ata_pci_device_do_resume(pdev); | 645 | ata_pci_device_do_resume(pdev); |
643 | 646 | ||
644 | if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { | 647 | if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { |
645 | printk("XXX\n"); | ||
646 | rc = init_controller(mmio_base, hpriv->cached_hctl); | 648 | rc = init_controller(mmio_base, hpriv->cached_hctl); |
647 | if (rc) | 649 | if (rc) |
648 | return rc; | 650 | return rc; |
@@ -652,6 +654,7 @@ static int inic_pci_device_resume(struct pci_dev *pdev) | |||
652 | 654 | ||
653 | return 0; | 655 | return 0; |
654 | } | 656 | } |
657 | #endif | ||
655 | 658 | ||
656 | static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 659 | static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
657 | { | 660 | { |
@@ -755,8 +758,10 @@ static const struct pci_device_id inic_pci_tbl[] = { | |||
755 | static struct pci_driver inic_pci_driver = { | 758 | static struct pci_driver inic_pci_driver = { |
756 | .name = DRV_NAME, | 759 | .name = DRV_NAME, |
757 | .id_table = inic_pci_tbl, | 760 | .id_table = inic_pci_tbl, |
761 | #ifdef CONFIG_PM | ||
758 | .suspend = ata_pci_device_suspend, | 762 | .suspend = ata_pci_device_suspend, |
759 | .resume = inic_pci_device_resume, | 763 | .resume = inic_pci_device_resume, |
764 | #endif | ||
760 | .probe = inic_init_one, | 765 | .probe = inic_init_one, |
761 | .remove = ata_pci_remove_one, | 766 | .remove = ata_pci_remove_one, |
762 | }; | 767 | }; |