ide: remove ide_pci_device_t tables with only one entry (7b77d864) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/ide/pci/cy82c693.c

+9 −12

Original line number	Diff line number	Diff line
		@@ -478,8 +478,7 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
		}
		}

		static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
		{ /* 0 */
		static ide_pci_device_t cy82c693_chipset __devinitdata = {
		.name = "CY82C693",
		.init_chipset = init_chipset_cy82c693,
		.init_iops = init_iops_cy82c693,
		@@ -487,12 +486,10 @@ static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
		.channels = 1,
		.autodma = AUTODMA,
		.bootable = ON_BOARD,
		}
		};

		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;
		int ret = -ENODEV;

		@@ -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 &&
		PCI_FUNC(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 */
		}
		return ret;

+2 −5

Original line number	Diff line number	Diff line
		@@ -729,8 +729,7 @@ pci_init_sgiioc4(struct pci_dev dev, ide_pci_device_t d)
		return ret;
		}

		static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
		{
		static ide_pci_device_t sgiioc4_chipset __devinitdata = {
		/* Channel 0 */
		.name = "SGIIOC4",
		.init_hwif = ide_init_sgiioc4,
		@@ -739,7 +738,6 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
		.autodma = AUTODMA,
		/* SGI IOC4 doesn't have enablebits. */
		.bootable = ON_BOARD,
		}
		};

		int
		@@ -751,8 +749,7 @@ ioc4_ide_attach_one(struct ioc4_driver_data *idd)
		if (idd->idd_variant == IOC4_VARIANT_PCI_RT)
		return 0;

		return pci_init_sgiioc4(idd->idd_pdev,
		&sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
		return pci_init_sgiioc4(idd->idd_pdev, &sgiioc4_chipset);
		}

		static struct ioc4_submodule ioc4_ide_submodule = {