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_hpt366.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_hpt366.c')
-rw-r--r-- | drivers/ata/pata_hpt366.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index e7d33c628a61..baf35f876030 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c | |||
@@ -328,8 +328,10 @@ static struct scsi_host_template hpt36x_sht = { | |||
328 | .slave_configure = ata_scsi_slave_config, | 328 | .slave_configure = ata_scsi_slave_config, |
329 | .slave_destroy = ata_scsi_slave_destroy, | 329 | .slave_destroy = ata_scsi_slave_destroy, |
330 | .bios_param = ata_std_bios_param, | 330 | .bios_param = ata_std_bios_param, |
331 | #ifdef CONFIG_PM | ||
331 | .resume = ata_scsi_device_resume, | 332 | .resume = ata_scsi_device_resume, |
332 | .suspend = ata_scsi_device_suspend, | 333 | .suspend = ata_scsi_device_suspend, |
334 | #endif | ||
333 | }; | 335 | }; |
334 | 336 | ||
335 | /* | 337 | /* |
@@ -457,12 +459,13 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
457 | return ata_pci_init_one(dev, port_info, 2); | 459 | return ata_pci_init_one(dev, port_info, 2); |
458 | } | 460 | } |
459 | 461 | ||
462 | #ifdef CONFIG_PM | ||
460 | static int hpt36x_reinit_one(struct pci_dev *dev) | 463 | static int hpt36x_reinit_one(struct pci_dev *dev) |
461 | { | 464 | { |
462 | hpt36x_init_chipset(dev); | 465 | hpt36x_init_chipset(dev); |
463 | return ata_pci_device_resume(dev); | 466 | return ata_pci_device_resume(dev); |
464 | } | 467 | } |
465 | 468 | #endif | |
466 | 469 | ||
467 | static const struct pci_device_id hpt36x[] = { | 470 | static const struct pci_device_id hpt36x[] = { |
468 | { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), }, | 471 | { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), }, |
@@ -474,8 +477,10 @@ static struct pci_driver hpt36x_pci_driver = { | |||
474 | .id_table = hpt36x, | 477 | .id_table = hpt36x, |
475 | .probe = hpt36x_init_one, | 478 | .probe = hpt36x_init_one, |
476 | .remove = ata_pci_remove_one, | 479 | .remove = ata_pci_remove_one, |
480 | #ifdef CONFIG_PM | ||
477 | .suspend = ata_pci_device_suspend, | 481 | .suspend = ata_pci_device_suspend, |
478 | .resume = hpt36x_reinit_one, | 482 | .resume = hpt36x_reinit_one, |
483 | #endif | ||
479 | }; | 484 | }; |
480 | 485 | ||
481 | static int __init hpt36x_init(void) | 486 | static int __init hpt36x_init(void) |