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_hpt3x3.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_hpt3x3.c')
-rw-r--r-- | drivers/ata/pata_hpt3x3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c index 483ce7c12c9a..813485c8526c 100644 --- a/drivers/ata/pata_hpt3x3.c +++ b/drivers/ata/pata_hpt3x3.c | |||
@@ -119,8 +119,10 @@ static struct scsi_host_template hpt3x3_sht = { | |||
119 | .slave_configure = ata_scsi_slave_config, | 119 | .slave_configure = ata_scsi_slave_config, |
120 | .slave_destroy = ata_scsi_slave_destroy, | 120 | .slave_destroy = ata_scsi_slave_destroy, |
121 | .bios_param = ata_std_bios_param, | 121 | .bios_param = ata_std_bios_param, |
122 | #ifdef CONFIG_PM | ||
122 | .resume = ata_scsi_device_resume, | 123 | .resume = ata_scsi_device_resume, |
123 | .suspend = ata_scsi_device_suspend, | 124 | .suspend = ata_scsi_device_suspend, |
125 | #endif | ||
124 | }; | 126 | }; |
125 | 127 | ||
126 | static struct ata_port_operations hpt3x3_port_ops = { | 128 | static struct ata_port_operations hpt3x3_port_ops = { |
@@ -206,11 +208,13 @@ static int hpt3x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
206 | return ata_pci_init_one(dev, port_info, 2); | 208 | return ata_pci_init_one(dev, port_info, 2); |
207 | } | 209 | } |
208 | 210 | ||
211 | #ifdef CONFIG_PM | ||
209 | static int hpt3x3_reinit_one(struct pci_dev *dev) | 212 | static int hpt3x3_reinit_one(struct pci_dev *dev) |
210 | { | 213 | { |
211 | hpt3x3_init_chipset(dev); | 214 | hpt3x3_init_chipset(dev); |
212 | return ata_pci_device_resume(dev); | 215 | return ata_pci_device_resume(dev); |
213 | } | 216 | } |
217 | #endif | ||
214 | 218 | ||
215 | static const struct pci_device_id hpt3x3[] = { | 219 | static const struct pci_device_id hpt3x3[] = { |
216 | { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT343), }, | 220 | { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT343), }, |
@@ -223,8 +227,10 @@ static struct pci_driver hpt3x3_pci_driver = { | |||
223 | .id_table = hpt3x3, | 227 | .id_table = hpt3x3, |
224 | .probe = hpt3x3_init_one, | 228 | .probe = hpt3x3_init_one, |
225 | .remove = ata_pci_remove_one, | 229 | .remove = ata_pci_remove_one, |
230 | #ifdef CONFIG_PM | ||
226 | .suspend = ata_pci_device_suspend, | 231 | .suspend = ata_pci_device_suspend, |
227 | .resume = hpt3x3_reinit_one, | 232 | .resume = hpt3x3_reinit_one, |
233 | #endif | ||
228 | }; | 234 | }; |
229 | 235 | ||
230 | static int __init hpt3x3_init(void) | 236 | static int __init hpt3x3_init(void) |