diff options
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
-rw-r--r-- | drivers/ata/pata_cs5530.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 637d8b302e3e..1b67923d7a4e 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
@@ -335,7 +335,7 @@ fail_put: | |||
335 | 335 | ||
336 | static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 336 | static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
337 | { | 337 | { |
338 | static struct ata_port_info info = { | 338 | static const struct ata_port_info info = { |
339 | .sht = &cs5530_sht, | 339 | .sht = &cs5530_sht, |
340 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, | 340 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, |
341 | .pio_mask = 0x1f, | 341 | .pio_mask = 0x1f, |
@@ -344,23 +344,23 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
344 | .port_ops = &cs5530_port_ops | 344 | .port_ops = &cs5530_port_ops |
345 | }; | 345 | }; |
346 | /* The docking connector doesn't do UDMA, and it seems not MWDMA */ | 346 | /* The docking connector doesn't do UDMA, and it seems not MWDMA */ |
347 | static struct ata_port_info info_palmax_secondary = { | 347 | static const struct ata_port_info info_palmax_secondary = { |
348 | .sht = &cs5530_sht, | 348 | .sht = &cs5530_sht, |
349 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, | 349 | .flags = ATA_FLAG_SLAVE_POSS|ATA_FLAG_SRST, |
350 | .pio_mask = 0x1f, | 350 | .pio_mask = 0x1f, |
351 | .port_ops = &cs5530_port_ops | 351 | .port_ops = &cs5530_port_ops |
352 | }; | 352 | }; |
353 | static struct ata_port_info *port_info[2] = { &info, &info }; | 353 | const struct ata_port_info *ppi[] = { &info, NULL }; |
354 | 354 | ||
355 | /* Chip initialisation */ | 355 | /* Chip initialisation */ |
356 | if (cs5530_init_chip()) | 356 | if (cs5530_init_chip()) |
357 | return -ENODEV; | 357 | return -ENODEV; |
358 | 358 | ||
359 | if (cs5530_is_palmax()) | 359 | if (cs5530_is_palmax()) |
360 | port_info[1] = &info_palmax_secondary; | 360 | ppi[1] = &info_palmax_secondary; |
361 | 361 | ||
362 | /* Now kick off ATA set up */ | 362 | /* Now kick off ATA set up */ |
363 | return ata_pci_init_one(pdev, port_info, 2); | 363 | return ata_pci_init_one(pdev, ppi); |
364 | } | 364 | } |
365 | 365 | ||
366 | #ifdef CONFIG_PM | 366 | #ifdef CONFIG_PM |