diff options
Diffstat (limited to 'drivers/ata/pata_sc1200.c')
-rw-r--r-- | drivers/ata/pata_sc1200.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index 66e8ff467c8d..225013ecf4b6 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
@@ -194,10 +194,6 @@ static struct scsi_host_template sc1200_sht = { | |||
194 | .slave_configure = ata_scsi_slave_config, | 194 | .slave_configure = ata_scsi_slave_config, |
195 | .slave_destroy = ata_scsi_slave_destroy, | 195 | .slave_destroy = ata_scsi_slave_destroy, |
196 | .bios_param = ata_std_bios_param, | 196 | .bios_param = ata_std_bios_param, |
197 | #ifdef CONFIG_PM | ||
198 | .resume = ata_scsi_device_resume, | ||
199 | .suspend = ata_scsi_device_suspend, | ||
200 | #endif | ||
201 | }; | 197 | }; |
202 | 198 | ||
203 | static struct ata_port_operations sc1200_port_ops = { | 199 | static struct ata_port_operations sc1200_port_ops = { |
@@ -247,7 +243,7 @@ static struct ata_port_operations sc1200_port_ops = { | |||
247 | 243 | ||
248 | static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 244 | static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
249 | { | 245 | { |
250 | static struct ata_port_info info = { | 246 | static const struct ata_port_info info = { |
251 | .sht = &sc1200_sht, | 247 | .sht = &sc1200_sht, |
252 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, | 248 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, |
253 | .pio_mask = 0x1f, | 249 | .pio_mask = 0x1f, |
@@ -255,10 +251,10 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
255 | .udma_mask = 0x07, | 251 | .udma_mask = 0x07, |
256 | .port_ops = &sc1200_port_ops | 252 | .port_ops = &sc1200_port_ops |
257 | }; | 253 | }; |
258 | static struct ata_port_info *port_info[2] = { &info, &info }; | ||
259 | |||
260 | /* Can't enable port 2 yet, see top comments */ | 254 | /* Can't enable port 2 yet, see top comments */ |
261 | return ata_pci_init_one(dev, port_info, 1); | 255 | const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; |
256 | |||
257 | return ata_pci_init_one(dev, ppi); | ||
262 | } | 258 | } |
263 | 259 | ||
264 | static const struct pci_device_id sc1200[] = { | 260 | static const struct pci_device_id sc1200[] = { |