diff options
| -rw-r--r-- | drivers/ide/pci/it821x.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index 4ce5db98f89a..a3d8959436c5 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
| @@ -628,17 +628,12 @@ static const struct ide_port_ops it821x_port_ops = { | |||
| 628 | .cable_detect = it821x_cable_detect, | 628 | .cable_detect = it821x_cable_detect, |
| 629 | }; | 629 | }; |
| 630 | 630 | ||
| 631 | #define DECLARE_ITE_DEV(name_str) \ | 631 | static const struct ide_port_info it821x_chipset __devinitdata = { |
| 632 | { \ | 632 | .name = "IT821X", |
| 633 | .name = name_str, \ | 633 | .init_chipset = init_chipset_it821x, |
| 634 | .init_chipset = init_chipset_it821x, \ | 634 | .init_hwif = init_hwif_it821x, |
| 635 | .init_hwif = init_hwif_it821x, \ | 635 | .port_ops = &it821x_port_ops, |
| 636 | .port_ops = &it821x_port_ops, \ | 636 | .pio_mask = ATA_PIO4, |
| 637 | .pio_mask = ATA_PIO4, \ | ||
| 638 | } | ||
| 639 | |||
| 640 | static const struct ide_port_info it821x_chipsets[] __devinitdata = { | ||
| 641 | /* 0 */ DECLARE_ITE_DEV("IT8212"), | ||
| 642 | }; | 637 | }; |
| 643 | 638 | ||
| 644 | /** | 639 | /** |
| @@ -661,7 +656,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic | |||
| 661 | return -ENOMEM; | 656 | return -ENOMEM; |
| 662 | } | 657 | } |
| 663 | 658 | ||
| 664 | rc = ide_pci_init_one(dev, &it821x_chipsets[id->driver_data], itdevs); | 659 | rc = ide_pci_init_one(dev, &it821x_chipset, itdevs); |
| 665 | if (rc) | 660 | if (rc) |
| 666 | kfree(itdevs); | 661 | kfree(itdevs); |
| 667 | 662 | ||
