diff options
Diffstat (limited to 'drivers/ata/pata_sil680.c')
-rw-r--r-- | drivers/ata/pata_sil680.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 8c0b25f145ae..440e2cb6ee75 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -341,7 +341,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev) | |||
341 | 341 | ||
342 | static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 342 | static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
343 | { | 343 | { |
344 | static struct ata_port_info info = { | 344 | static const struct ata_port_info info = { |
345 | .sht = &sil680_sht, | 345 | .sht = &sil680_sht, |
346 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 346 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, |
347 | .pio_mask = 0x1f, | 347 | .pio_mask = 0x1f, |
@@ -349,7 +349,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
349 | .udma_mask = 0x7f, | 349 | .udma_mask = 0x7f, |
350 | .port_ops = &sil680_port_ops | 350 | .port_ops = &sil680_port_ops |
351 | }; | 351 | }; |
352 | static struct ata_port_info info_slow = { | 352 | static const struct ata_port_info info_slow = { |
353 | .sht = &sil680_sht, | 353 | .sht = &sil680_sht, |
354 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 354 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, |
355 | .pio_mask = 0x1f, | 355 | .pio_mask = 0x1f, |
@@ -357,7 +357,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
357 | .udma_mask = 0x3f, | 357 | .udma_mask = 0x3f, |
358 | .port_ops = &sil680_port_ops | 358 | .port_ops = &sil680_port_ops |
359 | }; | 359 | }; |
360 | static struct ata_port_info *port_info[2] = {&info, &info}; | 360 | const struct ata_port_info *ppi[] = { &info, NULL }; |
361 | static int printed_version; | 361 | static int printed_version; |
362 | 362 | ||
363 | if (!printed_version++) | 363 | if (!printed_version++) |
@@ -366,12 +366,12 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
366 | switch(sil680_init_chip(pdev)) | 366 | switch(sil680_init_chip(pdev)) |
367 | { | 367 | { |
368 | case 0: | 368 | case 0: |
369 | port_info[0] = port_info[1] = &info_slow; | 369 | ppi[0] = &info_slow; |
370 | break; | 370 | break; |
371 | case 0x30: | 371 | case 0x30: |
372 | return -ENODEV; | 372 | return -ENODEV; |
373 | } | 373 | } |
374 | return ata_pci_init_one(pdev, port_info, 2); | 374 | return ata_pci_init_one(pdev, ppi); |
375 | } | 375 | } |
376 | 376 | ||
377 | #ifdef CONFIG_PM | 377 | #ifdef CONFIG_PM |