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_cmd64x.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_cmd64x.c')
-rw-r--r-- | drivers/ata/pata_cmd64x.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index adc21ce5b3b9..5b13bdd1edc0 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
@@ -285,8 +285,10 @@ static struct scsi_host_template cmd64x_sht = { | |||
285 | .slave_configure = ata_scsi_slave_config, | 285 | .slave_configure = ata_scsi_slave_config, |
286 | .slave_destroy = ata_scsi_slave_destroy, | 286 | .slave_destroy = ata_scsi_slave_destroy, |
287 | .bios_param = ata_std_bios_param, | 287 | .bios_param = ata_std_bios_param, |
288 | #ifdef CONFIG_PM | ||
288 | .resume = ata_scsi_device_resume, | 289 | .resume = ata_scsi_device_resume, |
289 | .suspend = ata_scsi_device_suspend, | 290 | .suspend = ata_scsi_device_suspend, |
291 | #endif | ||
290 | }; | 292 | }; |
291 | 293 | ||
292 | static struct ata_port_operations cmd64x_port_ops = { | 294 | static struct ata_port_operations cmd64x_port_ops = { |
@@ -479,6 +481,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
479 | return ata_pci_init_one(pdev, port_info, 2); | 481 | return ata_pci_init_one(pdev, port_info, 2); |
480 | } | 482 | } |
481 | 483 | ||
484 | #ifdef CONFIG_PM | ||
482 | static int cmd64x_reinit_one(struct pci_dev *pdev) | 485 | static int cmd64x_reinit_one(struct pci_dev *pdev) |
483 | { | 486 | { |
484 | u8 mrdmode; | 487 | u8 mrdmode; |
@@ -492,6 +495,7 @@ static int cmd64x_reinit_one(struct pci_dev *pdev) | |||
492 | #endif | 495 | #endif |
493 | return ata_pci_device_resume(pdev); | 496 | return ata_pci_device_resume(pdev); |
494 | } | 497 | } |
498 | #endif | ||
495 | 499 | ||
496 | static const struct pci_device_id cmd64x[] = { | 500 | static const struct pci_device_id cmd64x[] = { |
497 | { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 }, | 501 | { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 }, |
@@ -507,8 +511,10 @@ static struct pci_driver cmd64x_pci_driver = { | |||
507 | .id_table = cmd64x, | 511 | .id_table = cmd64x, |
508 | .probe = cmd64x_init_one, | 512 | .probe = cmd64x_init_one, |
509 | .remove = ata_pci_remove_one, | 513 | .remove = ata_pci_remove_one, |
514 | #ifdef CONFIG_PM | ||
510 | .suspend = ata_pci_device_suspend, | 515 | .suspend = ata_pci_device_suspend, |
511 | .resume = cmd64x_reinit_one, | 516 | .resume = cmd64x_reinit_one, |
517 | #endif | ||
512 | }; | 518 | }; |
513 | 519 | ||
514 | static int __init cmd64x_init(void) | 520 | static int __init cmd64x_init(void) |