Hi. On Fri, 2007-03-02 at 17:46 +0900, Tejun Heo wrote: > Add missing #ifdef CONFIG_PM conditionals around all PM related parts > in libata LLDs. > > Signed-off-by: Tejun Heo <htejun at gmail.com> > --- > drivers/ata/ahci.c | 14 ++++++++++++++ > drivers/ata/ata_generic.c | 4 ++++ > drivers/ata/ata_piix.c | 4 ++++ > drivers/ata/pata_ali.c | 6 ++++++ > drivers/ata/pata_amd.c | 6 ++++++ > drivers/ata/pata_atiixp.c | 4 ++++ > drivers/ata/pata_cmd64x.c | 6 ++++++ > drivers/ata/pata_cs5520.c | 7 +++++++ > drivers/ata/pata_cs5530.c | 6 ++++++ > drivers/ata/pata_cs5535.c | 4 ++++ > drivers/ata/pata_cypress.c | 4 ++++ > drivers/ata/pata_efar.c | 4 ++++ > drivers/ata/pata_hpt366.c | 7 ++++++- > drivers/ata/pata_hpt3x3.c | 6 ++++++ > drivers/ata/pata_it821x.c | 6 ++++++ > drivers/ata/pata_jmicron.c | 4 ++++ > drivers/ata/pata_marvell.c | 4 ++++ > drivers/ata/pata_mpiix.c | 4 ++++ > drivers/ata/pata_netcell.c | 4 ++++ > drivers/ata/pata_ns87410.c | 4 ++++ > drivers/ata/pata_oldpiix.c | 4 ++++ > drivers/ata/pata_opti.c | 4 ++++ > drivers/ata/pata_optidma.c | 4 ++++ > drivers/ata/pata_pdc202xx_old.c | 4 ++++ > drivers/ata/pata_radisys.c | 4 ++++ > drivers/ata/pata_rz1000.c | 6 ++++++ > drivers/ata/pata_sc1200.c | 4 ++++ > drivers/ata/pata_serverworks.c | 6 ++++++ > drivers/ata/pata_sil680.c | 4 ++++ > drivers/ata/pata_sis.c | 4 ++++ > drivers/ata/pata_triflex.c | 4 ++++ > drivers/ata/pata_via.c | 6 ++++++ > drivers/ata/sata_sil.c | 2 ++ > drivers/ata/sata_sil24.c | 2 ++ > 34 files changed, 165 insertions(+), 1 deletion(-) > > Index: work1/drivers/ata/ahci.c > =================================================================== > --- work1.orig/drivers/ata/ahci.c > +++ work1/drivers/ata/ahci.c > @@ -225,10 +225,12 @@ static void ahci_thaw(struct ata_port *a > static void ahci_error_handler(struct ata_port *ap); > static void ahci_vt8251_error_handler(struct ata_port *ap); > static void ahci_post_internal_cmd(struct ata_queued_cmd *qc); > +#ifdef CONFIG_PM > static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg); > static int ahci_port_resume(struct ata_port *ap); > static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); > static int ahci_pci_device_resume(struct pci_dev *pdev); Wouldn't it be simpler to add #else #define ahci_port_suspend(port, message) (NULL) etc (or something similar)? Regards, Nigel
