diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-15 01:49:30 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-24 02:37:03 -0400 |
commit | 281d426c7e64286f433645e27862e7744b1e9310 (patch) | |
tree | 580dcab54f53c2e6d056139294aad2416402e4bd /drivers/ata/sata_sil24.c | |
parent | 08be09b7c38a71b1677285c10a08725833ff9b95 (diff) |
[PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil*
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_sil24.c')
-rw-r--r-- | drivers/ata/sata_sil24.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 3a0161ddc33f..2d7cf3264587 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -339,7 +339,9 @@ static int sil24_port_start(struct ata_port *ap); | |||
339 | static void sil24_port_stop(struct ata_port *ap); | 339 | static void sil24_port_stop(struct ata_port *ap); |
340 | static void sil24_host_stop(struct ata_host_set *host_set); | 340 | static void sil24_host_stop(struct ata_host_set *host_set); |
341 | static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); | 341 | static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); |
342 | #ifdef CONFIG_PM | ||
342 | static int sil24_pci_device_resume(struct pci_dev *pdev); | 343 | static int sil24_pci_device_resume(struct pci_dev *pdev); |
344 | #endif | ||
343 | 345 | ||
344 | static const struct pci_device_id sil24_pci_tbl[] = { | 346 | static const struct pci_device_id sil24_pci_tbl[] = { |
345 | { 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 }, | 347 | { 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 }, |
@@ -355,8 +357,10 @@ static struct pci_driver sil24_pci_driver = { | |||
355 | .id_table = sil24_pci_tbl, | 357 | .id_table = sil24_pci_tbl, |
356 | .probe = sil24_init_one, | 358 | .probe = sil24_init_one, |
357 | .remove = ata_pci_remove_one, /* safe? */ | 359 | .remove = ata_pci_remove_one, /* safe? */ |
360 | #ifdef CONFIG_PM | ||
358 | .suspend = ata_pci_device_suspend, | 361 | .suspend = ata_pci_device_suspend, |
359 | .resume = sil24_pci_device_resume, | 362 | .resume = sil24_pci_device_resume, |
363 | #endif | ||
360 | }; | 364 | }; |
361 | 365 | ||
362 | static struct scsi_host_template sil24_sht = { | 366 | 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) | |||
1184 | return rc; | 1188 | return rc; |
1185 | } | 1189 | } |
1186 | 1190 | ||
1191 | #ifdef CONFIG_PM | ||
1187 | static int sil24_pci_device_resume(struct pci_dev *pdev) | 1192 | static int sil24_pci_device_resume(struct pci_dev *pdev) |
1188 | { | 1193 | { |
1189 | struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev); | 1194 | 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) | |||
1202 | 1207 | ||
1203 | return 0; | 1208 | return 0; |
1204 | } | 1209 | } |
1210 | #endif | ||
1205 | 1211 | ||
1206 | static int __init sil24_init(void) | 1212 | static int __init sil24_init(void) |
1207 | { | 1213 | { |