|
@@ -628,17 +628,12 @@ static const struct ide_port_ops it821x_port_ops = {
|
|
|
.cable_detect = it821x_cable_detect,
|
|
|
};
|
|
|
|
|
|
-#define DECLARE_ITE_DEV(name_str) \
|
|
|
- { \
|
|
|
- .name = name_str, \
|
|
|
- .init_chipset = init_chipset_it821x, \
|
|
|
- .init_hwif = init_hwif_it821x, \
|
|
|
- .port_ops = &it821x_port_ops, \
|
|
|
- .pio_mask = ATA_PIO4, \
|
|
|
- }
|
|
|
-
|
|
|
-static const struct ide_port_info it821x_chipsets[] __devinitdata = {
|
|
|
- /* 0 */ DECLARE_ITE_DEV("IT8212"),
|
|
|
+static const struct ide_port_info it821x_chipset __devinitdata = {
|
|
|
+ .name = "IT821X",
|
|
|
+ .init_chipset = init_chipset_it821x,
|
|
|
+ .init_hwif = init_hwif_it821x,
|
|
|
+ .port_ops = &it821x_port_ops,
|
|
|
+ .pio_mask = ATA_PIO4,
|
|
|
};
|
|
|
|
|
|
/**
|
|
@@ -661,7 +656,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- rc = ide_pci_init_one(dev, &it821x_chipsets[id->driver_data], itdevs);
|
|
|
+ rc = ide_pci_init_one(dev, &it821x_chipset, itdevs);
|
|
|
if (rc)
|
|
|
kfree(itdevs);
|
|
|
|