diff options
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 86a26186739c..b439351f1fd3 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -538,7 +538,7 @@ static struct ata_port_operations nv133_port_ops = { | |||
538 | 538 | ||
539 | static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 539 | static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
540 | { | 540 | { |
541 | static struct ata_port_info info[10] = { | 541 | static const struct ata_port_info info[10] = { |
542 | { /* 0: AMD 7401 */ | 542 | { /* 0: AMD 7401 */ |
543 | .sht = &amd_sht, | 543 | .sht = &amd_sht, |
544 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 544 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, |
@@ -620,7 +620,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
620 | .port_ops = &amd100_port_ops | 620 | .port_ops = &amd100_port_ops |
621 | } | 621 | } |
622 | }; | 622 | }; |
623 | static struct ata_port_info *port_info[2]; | 623 | const struct ata_port_info *ppi[] = { NULL, NULL }; |
624 | static int printed_version; | 624 | static int printed_version; |
625 | int type = id->driver_data; | 625 | int type = id->driver_data; |
626 | u8 rev; | 626 | u8 rev; |
@@ -652,9 +652,8 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
652 | ata_pci_clear_simplex(pdev); | 652 | ata_pci_clear_simplex(pdev); |
653 | 653 | ||
654 | /* And fire it up */ | 654 | /* And fire it up */ |
655 | 655 | ppi[0] = &info[type]; | |
656 | port_info[0] = port_info[1] = &info[type]; | 656 | return ata_pci_init_one(pdev, ppi); |
657 | return ata_pci_init_one(pdev, port_info, 2); | ||
658 | } | 657 | } |
659 | 658 | ||
660 | #ifdef CONFIG_PM | 659 | #ifdef CONFIG_PM |