[ide pci generic] remove dummy init_chipset_generic()

->init_chipset is optional
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fc847693
...@@ -41,11 +41,6 @@ ...@@ -41,11 +41,6 @@
#include "generic.h" #include "generic.h"
static unsigned int __devinit init_chipset_generic (struct pci_dev *dev, const char *name)
{
return 0;
}
static void __devinit init_hwif_generic (ide_hwif_t *hwif) static void __devinit init_hwif_generic (ide_hwif_t *hwif)
{ {
switch(hwif->pci_dev->device) { switch(hwif->pci_dev->device) {
......
...@@ -5,13 +5,11 @@ ...@@ -5,13 +5,11 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ide.h> #include <linux/ide.h>
static unsigned int init_chipset_generic(struct pci_dev *, const char *);
static void init_hwif_generic(ide_hwif_t *); static void init_hwif_generic(ide_hwif_t *);
static ide_pci_device_t generic_chipsets[] __devinitdata = { static ide_pci_device_t generic_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
.name = "NS87410", .name = "NS87410",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
...@@ -19,84 +17,72 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -19,84 +17,72 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 1 */ },{ /* 1 */
.name = "SAMURAI", .name = "SAMURAI",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 2 */ },{ /* 2 */
.name = "HT6565", .name = "HT6565",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 3 */ },{ /* 3 */
.name = "UM8673F", .name = "UM8673F",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 4 */ },{ /* 4 */
.name = "UM8886A", .name = "UM8886A",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 5 */ },{ /* 5 */
.name = "UM8886BF", .name = "UM8886BF",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 6 */ },{ /* 6 */
.name = "HINT_IDE", .name = "HINT_IDE",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 7 */ },{ /* 7 */
.name = "VIA_IDE", .name = "VIA_IDE",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 8 */ },{ /* 8 */
.name = "OPTI621V", .name = "OPTI621V",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 9 */ },{ /* 9 */
.name = "VIA8237SATA", .name = "VIA8237SATA",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
},{ /* 10 */ },{ /* 10 */
.name = "Piccolo0102", .name = "Piccolo0102",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 11 */ },{ /* 11 */
.name = "Piccolo0103", .name = "Piccolo0103",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.bootable = ON_BOARD, .bootable = ON_BOARD,
},{ /* 12 */ },{ /* 12 */
.name = "Piccolo0105", .name = "Piccolo0105",
.init_chipset = init_chipset_generic,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
......
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