ide: remove ide_pci_device_t tables with only one entry

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c1607e1a
...@@ -478,21 +478,18 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) ...@@ -478,21 +478,18 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
} }
} }
static ide_pci_device_t cy82c693_chipsets[] __devinitdata = { static ide_pci_device_t cy82c693_chipset __devinitdata = {
{ /* 0 */ .name = "CY82C693",
.name = "CY82C693", .init_chipset = init_chipset_cy82c693,
.init_chipset = init_chipset_cy82c693, .init_iops = init_iops_cy82c693,
.init_iops = init_iops_cy82c693, .init_hwif = init_hwif_cy82c693,
.init_hwif = init_hwif_cy82c693, .channels = 1,
.channels = 1, .autodma = AUTODMA,
.autodma = AUTODMA, .bootable = ON_BOARD,
.bootable = ON_BOARD,
}
}; };
static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
ide_pci_device_t *d = &cy82c693_chipsets[id->driver_data];
struct pci_dev *dev2; struct pci_dev *dev2;
int ret = -ENODEV; int ret = -ENODEV;
...@@ -501,7 +498,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev ...@@ -501,7 +498,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&
PCI_FUNC(dev->devfn) == 1) { PCI_FUNC(dev->devfn) == 1) {
dev2 = pci_get_slot(dev->bus, dev->devfn + 1); dev2 = pci_get_slot(dev->bus, dev->devfn + 1);
ret = ide_setup_pci_devices(dev, dev2, d); ret = ide_setup_pci_devices(dev, dev2, &cy82c693_chipset);
/* We leak pci refs here but thats ok - we can't be unloaded */ /* We leak pci refs here but thats ok - we can't be unloaded */
} }
return ret; return ret;
......
...@@ -729,8 +729,7 @@ pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d) ...@@ -729,8 +729,7 @@ pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
return ret; return ret;
} }
static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = { static ide_pci_device_t sgiioc4_chipset __devinitdata = {
{
/* Channel 0 */ /* Channel 0 */
.name = "SGIIOC4", .name = "SGIIOC4",
.init_hwif = ide_init_sgiioc4, .init_hwif = ide_init_sgiioc4,
...@@ -739,7 +738,6 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = { ...@@ -739,7 +738,6 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
.autodma = AUTODMA, .autodma = AUTODMA,
/* SGI IOC4 doesn't have enablebits. */ /* SGI IOC4 doesn't have enablebits. */
.bootable = ON_BOARD, .bootable = ON_BOARD,
}
}; };
int int
...@@ -751,8 +749,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd) ...@@ -751,8 +749,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd)
if (idd->idd_variant == IOC4_VARIANT_PCI_RT) if (idd->idd_variant == IOC4_VARIANT_PCI_RT)
return 0; return 0;
return pci_init_sgiioc4(idd->idd_pdev, return pci_init_sgiioc4(idd->idd_pdev, &sgiioc4_chipset);
&sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
} }
static struct ioc4_submodule ioc4_ide_submodule = { static struct ioc4_submodule ioc4_ide_submodule = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment