diff options
-rw-r--r-- | drivers/ata/sata_sil.c | 6 | ||||
-rw-r--r-- | drivers/ata/sata_sil24.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 907faa87239b..f17b3ae4dd37 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -109,7 +109,9 @@ enum { | |||
109 | }; | 109 | }; |
110 | 110 | ||
111 | static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); | 111 | static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); |
112 | #ifdef CONFIG_PM | ||
112 | static int sil_pci_device_resume(struct pci_dev *pdev); | 113 | static int sil_pci_device_resume(struct pci_dev *pdev); |
114 | #endif | ||
113 | static void sil_dev_config(struct ata_port *ap, struct ata_device *dev); | 115 | static void sil_dev_config(struct ata_port *ap, struct ata_device *dev); |
114 | static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); | 116 | static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); |
115 | static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); | 117 | 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 = { | |||
157 | .id_table = sil_pci_tbl, | 159 | .id_table = sil_pci_tbl, |
158 | .probe = sil_init_one, | 160 | .probe = sil_init_one, |
159 | .remove = ata_pci_remove_one, | 161 | .remove = ata_pci_remove_one, |
162 | #ifdef CONFIG_PM | ||
160 | .suspend = ata_pci_device_suspend, | 163 | .suspend = ata_pci_device_suspend, |
161 | .resume = sil_pci_device_resume, | 164 | .resume = sil_pci_device_resume, |
165 | #endif | ||
162 | }; | 166 | }; |
163 | 167 | ||
164 | static struct scsi_host_template sil_sht = { | 168 | static struct scsi_host_template sil_sht = { |
@@ -696,6 +700,7 @@ err_out: | |||
696 | return rc; | 700 | return rc; |
697 | } | 701 | } |
698 | 702 | ||
703 | #ifdef CONFIG_PM | ||
699 | static int sil_pci_device_resume(struct pci_dev *pdev) | 704 | static int sil_pci_device_resume(struct pci_dev *pdev) |
700 | { | 705 | { |
701 | struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev); | 706 | 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) | |||
707 | 712 | ||
708 | return 0; | 713 | return 0; |
709 | } | 714 | } |
715 | #endif | ||
710 | 716 | ||
711 | static int __init sil_init(void) | 717 | static int __init sil_init(void) |
712 | { | 718 | { |
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 | { |