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_rz1000.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_rz1000.c')
-rw-r--r-- | drivers/ata/pata_rz1000.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c index 60fc598f765d..f522daa2a6aa 100644 --- a/drivers/ata/pata_rz1000.c +++ b/drivers/ata/pata_rz1000.c | |||
@@ -94,8 +94,10 @@ static struct scsi_host_template rz1000_sht = { | |||
94 | .slave_configure = ata_scsi_slave_config, | 94 | .slave_configure = ata_scsi_slave_config, |
95 | .slave_destroy = ata_scsi_slave_destroy, | 95 | .slave_destroy = ata_scsi_slave_destroy, |
96 | .bios_param = ata_std_bios_param, | 96 | .bios_param = ata_std_bios_param, |
97 | #ifdef CONFIG_PM | ||
97 | .resume = ata_scsi_device_resume, | 98 | .resume = ata_scsi_device_resume, |
98 | .suspend = ata_scsi_device_suspend, | 99 | .suspend = ata_scsi_device_suspend, |
100 | #endif | ||
99 | }; | 101 | }; |
100 | 102 | ||
101 | static struct ata_port_operations rz1000_port_ops = { | 103 | static struct ata_port_operations rz1000_port_ops = { |
@@ -178,6 +180,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en | |||
178 | return -ENODEV; | 180 | return -ENODEV; |
179 | } | 181 | } |
180 | 182 | ||
183 | #ifdef CONFIG_PM | ||
181 | static int rz1000_reinit_one(struct pci_dev *pdev) | 184 | static int rz1000_reinit_one(struct pci_dev *pdev) |
182 | { | 185 | { |
183 | /* If this fails on resume (which is a "cant happen" case), we | 186 | /* If this fails on resume (which is a "cant happen" case), we |
@@ -186,6 +189,7 @@ static int rz1000_reinit_one(struct pci_dev *pdev) | |||
186 | panic("rz1000 fifo"); | 189 | panic("rz1000 fifo"); |
187 | return ata_pci_device_resume(pdev); | 190 | return ata_pci_device_resume(pdev); |
188 | } | 191 | } |
192 | #endif | ||
189 | 193 | ||
190 | static const struct pci_device_id pata_rz1000[] = { | 194 | static const struct pci_device_id pata_rz1000[] = { |
191 | { PCI_VDEVICE(PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000), }, | 195 | { PCI_VDEVICE(PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000), }, |
@@ -199,8 +203,10 @@ static struct pci_driver rz1000_pci_driver = { | |||
199 | .id_table = pata_rz1000, | 203 | .id_table = pata_rz1000, |
200 | .probe = rz1000_init_one, | 204 | .probe = rz1000_init_one, |
201 | .remove = ata_pci_remove_one, | 205 | .remove = ata_pci_remove_one, |
206 | #ifdef CONFIG_PM | ||
202 | .suspend = ata_pci_device_suspend, | 207 | .suspend = ata_pci_device_suspend, |
203 | .resume = rz1000_reinit_one, | 208 | .resume = rz1000_reinit_one, |
209 | #endif | ||
204 | }; | 210 | }; |
205 | 211 | ||
206 | static int __init rz1000_init(void) | 212 | static int __init rz1000_init(void) |