Skip to content

Commit 281d426

Browse files
Alexey DobriyanJeff Garzik
authored andcommitted
[PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil*
Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan <[email protected]> Cc: Jeff Garzik <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
1 parent 08be09b commit 281d426

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

drivers/ata/sata_sil.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ enum {
109109
};
110110

111111
static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
112+
#ifdef CONFIG_PM
112113
static int sil_pci_device_resume(struct pci_dev *pdev);
114+
#endif
113115
static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
114116
static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
115117
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 = {
157159
.id_table = sil_pci_tbl,
158160
.probe = sil_init_one,
159161
.remove = ata_pci_remove_one,
162+
#ifdef CONFIG_PM
160163
.suspend = ata_pci_device_suspend,
161164
.resume = sil_pci_device_resume,
165+
#endif
162166
};
163167

164168
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)
696700
return rc;
697701
}
698702

703+
#ifdef CONFIG_PM
699704
static int sil_pci_device_resume(struct pci_dev *pdev)
700705
{
701706
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)
707712

708713
return 0;
709714
}
715+
#endif
710716

711717
static int __init sil_init(void)
712718
{

drivers/ata/sata_sil24.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,9 @@ static int sil24_port_start(struct ata_port *ap);
339339
static void sil24_port_stop(struct ata_port *ap);
340340
static void sil24_host_stop(struct ata_host_set *host_set);
341341
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
342+
#ifdef CONFIG_PM
342343
static int sil24_pci_device_resume(struct pci_dev *pdev);
344+
#endif
343345

344346
static const struct pci_device_id sil24_pci_tbl[] = {
345347
{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
@@ -355,8 +357,10 @@ static struct pci_driver sil24_pci_driver = {
355357
.id_table = sil24_pci_tbl,
356358
.probe = sil24_init_one,
357359
.remove = ata_pci_remove_one, /* safe? */
360+
#ifdef CONFIG_PM
358361
.suspend = ata_pci_device_suspend,
359362
.resume = sil24_pci_device_resume,
363+
#endif
360364
};
361365

362366
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)
11841188
return rc;
11851189
}
11861190

1191+
#ifdef CONFIG_PM
11871192
static int sil24_pci_device_resume(struct pci_dev *pdev)
11881193
{
11891194
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)
12021207

12031208
return 0;
12041209
}
1210+
#endif
12051211

12061212
static int __init sil24_init(void)
12071213
{

0 commit comments

Comments
 (0)