Commit 438ac6d5 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: add missing CONFIG_PM in LLDs 



Add missing #ifdef CONFIG_PM conditionals around all PM related parts
in libata LLDs.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b23ff244

drivers/ata/ahci.c

+14 −0
Original line number Diff line number Diff line
@@ -219,10 +219,12 @@ static void ahci_thaw(struct ata_port *ap); 
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);

#endif



static struct scsi_host_template ahci_sht = {

	.module			= THIS_MODULE,
@@ -241,8 +243,10 @@ static struct scsi_host_template ahci_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.suspend		= ata_scsi_device_suspend,

	.resume			= ata_scsi_device_resume,

#endif

};



static const struct ata_port_operations ahci_ops = {
@@ -271,8 +275,10 @@ static const struct ata_port_operations ahci_ops = { 
	.error_handler		= ahci_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,
@@ -304,8 +310,10 @@ static const struct ata_port_operations ahci_vt8251_ops = { 
	.error_handler		= ahci_vt8251_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,
@@ -436,8 +444,10 @@ static struct pci_driver ahci_pci_driver = { 
	.id_table		= ahci_pci_tbl,

	.probe			= ahci_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ahci_pci_device_suspend,

	.resume			= ahci_pci_device_resume,

#endif

};
@@ -577,6 +587,7 @@ static void ahci_power_up(void __iomem *port_mmio, u32 cap) 
	writel(cmd | PORT_CMD_ICC_ACTIVE, port_mmio + PORT_CMD);

}



#ifdef CONFIG_PM

static void ahci_power_down(void __iomem *port_mmio, u32 cap)

{

	u32 cmd, scontrol;
@@ -594,6 +605,7 @@ static void ahci_power_down(void __iomem *port_mmio, u32 cap) 
	cmd &= ~PORT_CMD_SPIN_UP;

	writel(cmd, port_mmio + PORT_CMD);

}

#endif



static void ahci_init_port(void __iomem *port_mmio, u32 cap,

			   dma_addr_t cmd_slot_dma, dma_addr_t rx_fis_dma)
@@ -1335,6 +1347,7 @@ 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)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;
@@ -1413,6 +1426,7 @@ static int ahci_pci_device_resume(struct pci_dev *pdev) 


	return 0;

}

#endif



static int ahci_port_start(struct ata_port *ap)

{

drivers/ata/ata_generic.c

+4 −0
Original line number Diff line number Diff line
@@ -119,8 +119,10 @@ static struct scsi_host_template generic_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



static struct ata_port_operations generic_port_ops = {
@@ -230,8 +232,10 @@ static struct pci_driver ata_generic_pci_driver = { 
	.id_table	= ata_generic,

	.probe 		= ata_generic_init_one,

	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

	.resume		= ata_pci_device_resume,

#endif

};



static int __init ata_generic_init(void)

drivers/ata/ata_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -253,8 +253,10 @@ static struct pci_driver piix_pci_driver = { 
	.id_table		= piix_pci_tbl,

	.probe			= piix_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ata_pci_device_suspend,

	.resume			= ata_pci_device_resume,

#endif

};



static struct scsi_host_template piix_sht = {
@@ -273,8 +275,10 @@ static struct scsi_host_template piix_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



static const struct ata_port_operations piix_pata_ops = {

drivers/ata/pata_ali.c

+6 −0
Original line number Diff line number Diff line
@@ -345,8 +345,10 @@ static struct scsi_host_template ali_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



/*
@@ -667,11 +669,13 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return ata_pci_init_one(pdev, port_info, 2);

}



#ifdef CONFIG_PM

static int ali_reinit_one(struct pci_dev *pdev)

{

	ali_init_chipset(pdev);

	return ata_pci_device_resume(pdev);

}

#endif



static const struct pci_device_id ali[] = {

	{ PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5228), },
@@ -685,8 +689,10 @@ static struct pci_driver ali_pci_driver = { 
	.id_table	= ali,

	.probe 		= ali_init_one,

	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

	.resume		= ali_reinit_one,

#endif

};



static int __init ali_init(void)

drivers/ata/pata_amd.c

+6 −0
Original line number Diff line number Diff line
@@ -334,8 +334,10 @@ static struct scsi_host_template amd_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



static struct ata_port_operations amd33_port_ops = {
@@ -663,6 +665,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return ata_pci_init_one(pdev, port_info, 2);

}



#ifdef CONFIG_PM

static int amd_reinit_one(struct pci_dev *pdev)

{

	if (pdev->vendor == PCI_VENDOR_ID_AMD) {
@@ -679,6 +682,7 @@ static int amd_reinit_one(struct pci_dev *pdev) 
	}

	return ata_pci_device_resume(pdev);

}

#endif



static const struct pci_device_id amd[] = {

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_COBRA_7401),		0 },
@@ -708,8 +712,10 @@ static struct pci_driver amd_pci_driver = { 
	.id_table	= amd,

	.probe 		= amd_init_one,

	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

	.resume		= amd_reinit_one,

#endif

};



static int __init amd_init(void)