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_cs5530.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_cs5530.c')
-rw-r--r-- | drivers/ata/pata_cs5530.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 78c7cdfff69d..db63e80e608b 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
@@ -188,8 +188,10 @@ static struct scsi_host_template cs5530_sht = { | |||
188 | .slave_configure = ata_scsi_slave_config, | 188 | .slave_configure = ata_scsi_slave_config, |
189 | .slave_destroy = ata_scsi_slave_destroy, | 189 | .slave_destroy = ata_scsi_slave_destroy, |
190 | .bios_param = ata_std_bios_param, | 190 | .bios_param = ata_std_bios_param, |
191 | #ifdef CONFIG_PM | ||
191 | .resume = ata_scsi_device_resume, | 192 | .resume = ata_scsi_device_resume, |
192 | .suspend = ata_scsi_device_suspend, | 193 | .suspend = ata_scsi_device_suspend, |
194 | #endif | ||
193 | }; | 195 | }; |
194 | 196 | ||
195 | static struct ata_port_operations cs5530_port_ops = { | 197 | static struct ata_port_operations cs5530_port_ops = { |
@@ -376,6 +378,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
376 | return ata_pci_init_one(pdev, port_info, 2); | 378 | return ata_pci_init_one(pdev, port_info, 2); |
377 | } | 379 | } |
378 | 380 | ||
381 | #ifdef CONFIG_PM | ||
379 | static int cs5530_reinit_one(struct pci_dev *pdev) | 382 | static int cs5530_reinit_one(struct pci_dev *pdev) |
380 | { | 383 | { |
381 | /* If we fail on resume we are doomed */ | 384 | /* If we fail on resume we are doomed */ |
@@ -383,6 +386,7 @@ static int cs5530_reinit_one(struct pci_dev *pdev) | |||
383 | BUG(); | 386 | BUG(); |
384 | return ata_pci_device_resume(pdev); | 387 | return ata_pci_device_resume(pdev); |
385 | } | 388 | } |
389 | #endif /* CONFIG_PM */ | ||
386 | 390 | ||
387 | static const struct pci_device_id cs5530[] = { | 391 | static const struct pci_device_id cs5530[] = { |
388 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), }, | 392 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), }, |
@@ -395,8 +399,10 @@ static struct pci_driver cs5530_pci_driver = { | |||
395 | .id_table = cs5530, | 399 | .id_table = cs5530, |
396 | .probe = cs5530_init_one, | 400 | .probe = cs5530_init_one, |
397 | .remove = ata_pci_remove_one, | 401 | .remove = ata_pci_remove_one, |
402 | #ifdef CONFIG_PM | ||
398 | .suspend = ata_pci_device_suspend, | 403 | .suspend = ata_pci_device_suspend, |
399 | .resume = cs5530_reinit_one, | 404 | .resume = cs5530_reinit_one, |
405 | #endif | ||
400 | }; | 406 | }; |
401 | 407 | ||
402 | static int __init cs5530_init(void) | 408 | static int __init cs5530_init(void) |