Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281d426c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Jeff Garzik
Browse files

[PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil* 



Remove some code which is unneeded if CONFIG_PM=n.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 08be09b7

drivers/ata/sata_sil.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -109,7 +109,9 @@ enum { 
};

};





static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);

static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);

#ifdef CONFIG_PM

static int sil_pci_device_resume(struct pci_dev *pdev);

static int sil_pci_device_resume(struct pci_dev *pdev);

#endif

static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);

static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);

static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);

static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);

static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);

static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
@@ -157,8 +159,10 @@ static struct pci_driver sil_pci_driver = { 
	.id_table		= sil_pci_tbl,

	.id_table		= sil_pci_tbl,

	.probe			= sil_init_one,

	.probe			= sil_init_one,

	.remove			= ata_pci_remove_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ata_pci_device_suspend,

	.suspend		= ata_pci_device_suspend,

	.resume			= sil_pci_device_resume,

	.resume			= sil_pci_device_resume,

#endif

};

};





static struct scsi_host_template sil_sht = {

static struct scsi_host_template sil_sht = {
@@ -696,6 +700,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	return rc;

	return rc;

}

}





#ifdef CONFIG_PM

static int sil_pci_device_resume(struct pci_dev *pdev)

static int sil_pci_device_resume(struct pci_dev *pdev)

{

{

	struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);

	struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
@@ -707,6 +712,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev) 




	return 0;

	return 0;

}

}

#endif





static int __init sil_init(void)

static int __init sil_init(void)

{

{

drivers/ata/sata_sil24.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -339,7 +339,9 @@ static int sil24_port_start(struct ata_port *ap); 
static void sil24_port_stop(struct ata_port *ap);

static void sil24_port_stop(struct ata_port *ap);

static void sil24_host_stop(struct ata_host_set *host_set);

static void sil24_host_stop(struct ata_host_set *host_set);

static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);

static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);

#ifdef CONFIG_PM

static int sil24_pci_device_resume(struct pci_dev *pdev);

static int sil24_pci_device_resume(struct pci_dev *pdev);

#endif





static const struct pci_device_id sil24_pci_tbl[] = {

static const struct pci_device_id sil24_pci_tbl[] = {

	{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },

	{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
@@ -355,8 +357,10 @@ static struct pci_driver sil24_pci_driver = { 
	.id_table		= sil24_pci_tbl,

	.id_table		= sil24_pci_tbl,

	.probe			= sil24_init_one,

	.probe			= sil24_init_one,

	.remove			= ata_pci_remove_one, /* safe? */

	.remove			= ata_pci_remove_one, /* safe? */

#ifdef CONFIG_PM

	.suspend		= ata_pci_device_suspend,

	.suspend		= ata_pci_device_suspend,

	.resume			= sil24_pci_device_resume,

	.resume			= sil24_pci_device_resume,

#endif

};

};





static struct scsi_host_template sil24_sht = {

static struct scsi_host_template sil24_sht = {
@@ -1184,6 +1188,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return rc;

	return rc;

}

}





#ifdef CONFIG_PM

static int sil24_pci_device_resume(struct pci_dev *pdev)

static int sil24_pci_device_resume(struct pci_dev *pdev)

{

{

	struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);

	struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
@@ -1202,6 +1207,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev) 




	return 0;

	return 0;

}

}

#endif





static int __init sil24_init(void)

static int __init sil24_init(void)

{

{