[PATCH] IDE PCI: don't initialize fields of static chipset tables to zero

Also remove unused EOL define from ide.h.

This trivial patch makes grepping a lot easier.

diff --git a/drivers/ide/pci/adma100.h b/drivers/ide/pci/adma100.h
index 4fb0e6dd751a930be709135c8cefd8d60e293b69..f357b8ca8ab985f6a9dcb75664278869ca34ab9c 100644 (file)
--- a/drivers/ide/pci/adma100.h
+++ b/drivers/ide/pci/adma100.h
@@ -17,19 +17,11 @@ static ide_pci_device_t pdcadma_chipsets[] __devinitdata = {
                .name           = "ADMA100",
                .init_setup     = init_setup_pdcadma,
                .init_chipset   = init_chipset_pdcadma,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdcadma,
                .init_dma       = init_dma_pdcadma,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 }
 

diff --git a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h
index c4145488dd6c1104a0df5930728d1d1e6a264d01..fe088bc3d1ebede7c0e02f8485dd07d4e930395e 100644 (file)
--- a/drivers/ide/pci/aec62xx.h
+++ b/drivers/ide/pci/aec62xx.h
@@ -83,70 +83,58 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .name           = "AEC6210",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_ARTOP,
                .device         = PCI_DEVICE_ID_ARTOP_ATP860,
                .name           = "AEC6260",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_ARTOP,
                .device         = PCI_DEVICE_ID_ARTOP_ATP860R,
                .name           = "AEC6260R",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = NEVER_BOARD,
-               .extra          = 0,
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_ARTOP,
                .device         = PCI_DEVICE_ID_ARTOP_ATP865,
                .name           = "AEC6X80",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 4 */
                .vendor         = PCI_VENDOR_ID_ARTOP,
                .device         = PCI_DEVICE_ID_ARTOP_ATP865R,
                .name           = "AEC6X80R",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        }
 };
 

diff --git a/drivers/ide/pci/alim15x3.h b/drivers/ide/pci/alim15x3.h
index 439bd5031a5952346907add2ccac78d432f402e1..748114e9a8b50c7f4e04aee6e89d3a248b8c6b22 100644 (file)
--- a/drivers/ide/pci/alim15x3.h
+++ b/drivers/ide/pci/alim15x3.h
@@ -18,19 +18,11 @@ static ide_pci_device_t ali15x3_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_AL_M5229,
                .name           = "ALI15X3",
                .init_chipset   = init_chipset_ali15x3,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_ali15x3,
                .init_dma       = init_dma_ali15x3,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/amd74xx.h b/drivers/ide/pci/amd74xx.h
index cb265c8b71acc5392c9098d9bea086779bc1e98f..376f862e9c00845b0a5b185ee52bf818b1abe097 100644 (file)
--- a/drivers/ide/pci/amd74xx.h
+++ b/drivers/ide/pci/amd74xx.h
@@ -21,7 +21,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_AMD,
                .device         = PCI_DEVICE_ID_AMD_VIPER_7409,
@@ -32,7 +31,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_AMD,
                .device         = PCI_DEVICE_ID_AMD_VIPER_7411,
@@ -43,7 +41,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_AMD,
                .device         = PCI_DEVICE_ID_AMD_OPUS_7441,
@@ -54,7 +51,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0
        },{     /* 4 */
                .vendor         = PCI_VENDOR_ID_AMD,
                .device         = PCI_DEVICE_ID_AMD_8111_IDE,
@@ -65,7 +61,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .channels       = 2,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0
        },
        {       /* 5 */
                .vendor         = PCI_VENDOR_ID_NVIDIA,
@@ -77,7 +72,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },
        {       /* 6 */
                .vendor         = PCI_VENDOR_ID_NVIDIA,
@@ -89,7 +83,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },
        {       /* 7 */
                .vendor         = PCI_VENDOR_ID_NVIDIA,
@@ -156,12 +149,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
                .bootable       = ON_BOARD,
-       },
-       {
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/cmd64x.h b/drivers/ide/pci/cmd64x.h
index ae6359c2ed61cf1565650d197efa11ad6582c7a5..423e95e8e5bd93aaf401238467797d56781b71de 100644 (file)
--- a/drivers/ide/pci/cmd64x.h
+++ b/drivers/ide/pci/cmd64x.h
@@ -69,54 +69,38 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_CMD_643,
                .name           = "CMD643",
                .init_chipset   = init_chipset_cmd64x,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cmd64x,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_CMD,
                .device         = PCI_DEVICE_ID_CMD_646,
                .name           = "CMD646",
                .init_chipset   = init_chipset_cmd64x,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cmd64x,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_CMD,
                .device = PCI_DEVICE_ID_CMD_648,
                .name           = "CMD648",
                .init_chipset   = init_chipset_cmd64x,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cmd64x,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{
                .vendor         = PCI_VENDOR_ID_CMD,
                .device         = PCI_DEVICE_ID_CMD_649,
                .name           = "CMD649",
                .init_chipset   = init_chipset_cmd64x,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cmd64x,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 2,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/cs5520.h b/drivers/ide/pci/cs5520.h
index 21e8cb39db4a00c8b04ec9a8a46be5051301ca07..339530613a7f985fe1fdaf6a0988abaaa3e2a98d 100644 (file)
--- a/drivers/ide/pci/cs5520.h
+++ b/drivers/ide/pci/cs5520.h
@@ -18,13 +18,11 @@ static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
                .name           = "Cyrix 5510",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cs5520,
                .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },
        {
                .vendor         = PCI_VENDOR_ID_CYRIX,
@@ -32,13 +30,11 @@ static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
                .name           = "Cyrix 5520",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cs5520,
                .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
-               .extra          = 0,
        }
 };
 

diff --git a/drivers/ide/pci/cs5530.h b/drivers/ide/pci/cs5530.h
index 89f448e983a6de7c3d4ea46c6767736b896e8b32..cf651f2a9c6f32e17e8401d86ba4a417ad7e4905 100644 (file)
--- a/drivers/ide/pci/cs5530.h
+++ b/drivers/ide/pci/cs5530.h
@@ -16,18 +16,10 @@ static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_CYRIX_5530_IDE,
                .name           = "CS5530",
                .init_chipset   = init_chipset_cs5530,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_cs5530,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/cy82c693.h b/drivers/ide/pci/cy82c693.h
index 33c0b6466be4c0688410b5ae7ab7897f3b2784aa..8a22479f6b7e9279be8ee8f9cb550dacf17949d1 100644 (file)
--- a/drivers/ide/pci/cy82c693.h
+++ b/drivers/ide/pci/cy82c693.h
@@ -76,17 +76,9 @@ static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_cy82c693,
                .init_iops      = init_iops_cy82c693,
                .init_hwif      = init_hwif_cy82c693,
-               .init_dma       = NULL,
                .channels       = 1,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
index 953cc118dae4205573d3890c0ff999ccd96f94c5..fdaaf211339b9c0fb3a5d489cc406629850beae9 100644 (file)
--- a/drivers/ide/pci/generic.h
+++ b/drivers/ide/pci/generic.h
@@ -14,121 +14,92 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_NS_87410,
                .name           = "NS87410",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
         },{    /* 1 */
                .vendor         = PCI_VENDOR_ID_PCTECH,
                .device         = PCI_DEVICE_ID_PCTECH_SAMURAI_IDE,
                .name           = "SAMURAI",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_HOLTEK,
                .device         = PCI_DEVICE_ID_HOLTEK_6565,
                .name           = "HT6565",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_UMC,
                .device         = PCI_DEVICE_ID_UMC_UM8673F,
                .name           = "UM8673F",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 4 */
                .vendor         = PCI_VENDOR_ID_UMC,
                .device         = PCI_DEVICE_ID_UMC_UM8886A,
                .name           = "UM8886A",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 5 */
                .vendor         = PCI_VENDOR_ID_UMC,
                .device         = PCI_DEVICE_ID_UMC_UM8886BF,
                .name           = "UM8886BF",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 6 */
                .vendor         = PCI_VENDOR_ID_HINT,
                .device         = PCI_DEVICE_ID_HINT_VXPROII_IDE,
                .name           = "HINT_IDE",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 7 */
                .vendor         = PCI_VENDOR_ID_VIA,
                .device         = PCI_DEVICE_ID_VIA_82C561,
                .name           = "VIA_IDE",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 8 */
                .vendor         = PCI_VENDOR_ID_OPTI,
                .device         = PCI_DEVICE_ID_OPTI_82C558,
                .name           = "OPTI621V",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 9 */
                .vendor         = PCI_VENDOR_ID_VIA,
                .device         = PCI_DEVICE_ID_VIA_8237_SATA,
                .name           = "VIA8237SATA",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{ /* 10 */
                .vendor         = PCI_VENDOR_ID_TOSHIBA,
                .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO,
@@ -156,11 +127,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .channels       = 2,
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 
@@ -171,20 +137,11 @@ static ide_pci_device_t unknown_chipset[] __devinitdata = {
                .device         = 0,
                .name           = "PCI_IDE",
                .init_chipset   = init_chipset_generic,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_generic,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
-
 };
 #endif
 

diff --git a/drivers/ide/pci/hpt34x.h b/drivers/ide/pci/hpt34x.h
index 47b4be1001ba81be411ac1d751043cfd6e49b982..9fa3813a5ef74f4be1628f524ae4ec7835765a68 100644 (file)
--- a/drivers/ide/pci/hpt34x.h
+++ b/drivers/ide/pci/hpt34x.h
@@ -22,18 +22,11 @@ static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_TTI_HPT343,
                .name           = "HPT34X",
                .init_chipset   = init_chipset_hpt34x,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt34x,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = NEVER_BOARD,
                .extra          = 16
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/hpt366.h b/drivers/ide/pci/hpt366.h
index d9f69f08630e7407245979763ff8433d9d849211..8987b25c8619ef7c52e3b9fc450a842f75615fbc 100644 (file)
--- a/drivers/ide/pci/hpt366.h
+++ b/drivers/ide/pci/hpt366.h
@@ -430,12 +430,10 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .name           = "HPT366",
                .init_setup     = init_setup_hpt366,
                .init_chipset   = init_chipset_hpt366,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt366,
                .init_dma       = init_dma_hpt366,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
                .extra          = 240
        },{     /* 1 */
@@ -444,61 +442,44 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .name           = "HPT372A",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt366,
                .init_dma       = init_dma_hpt366,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_TTI,
                .device         = PCI_DEVICE_ID_TTI_HPT302,
                .name           = "HPT302",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt366,
                .init_dma       = init_dma_hpt366,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_TTI,
                .device         = PCI_DEVICE_ID_TTI_HPT371,
                .name           = "HPT371",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt366,
                .init_dma       = init_dma_hpt366,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0
        },{     /* 4 */
                .vendor         = PCI_VENDOR_ID_TTI,
                .device         = PCI_DEVICE_ID_TTI_HPT374,
                .name           = "HPT374",
                .init_setup     = init_setup_hpt374,
                .init_chipset   = init_chipset_hpt366,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_hpt366,
                .init_dma       = init_dma_hpt366,
                .channels       = 2,    /* 4 */
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/it8172.h b/drivers/ide/pci/it8172.h
index 6c49b6f416eb1318ccf1bd48813d054d436fc3e5..e80bc6283af78d3b86b4575f7a3395faabcedd5f 100644 (file)
--- a/drivers/ide/pci/it8172.h
+++ b/drivers/ide/pci/it8172.h
@@ -25,18 +25,11 @@ static ide_pci_device_t it8172_chipsets[] __devinitdata = {
                .name           = "IT8172G",
                .init_setup     = init_setup_it8172,
                .init_chipset   = init_chipset_it8172,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_it8172,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/ns87415.h b/drivers/ide/pci/ns87415.h
index 597803e40220e9eb56800f9321110be28fe627a9..8c4c1b8fcbbb8f213161605624895fbd6fb6b87a 100644 (file)
--- a/drivers/ide/pci/ns87415.h
+++ b/drivers/ide/pci/ns87415.h
@@ -12,19 +12,10 @@ static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
                .vendor         = PCI_VENDOR_ID_NS,
                .device         = PCI_DEVICE_ID_NS_87415,
                .name           = "NS87415",
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_ns87415,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/opti621.h b/drivers/ide/pci/opti621.h
index c0190467c4a63432c28510d17fcd61815448216f..8860eeb8a2f876d24a556744a6d431393078ff8b 100644 (file)
--- a/drivers/ide/pci/opti621.h
+++ b/drivers/ide/pci/opti621.h
@@ -14,32 +14,21 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_OPTI_82C621,
                .name           = "OPTI621",
                .init_setup     = init_setup_opti621,
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_opti621,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_OPTI,
                .device         = PCI_DEVICE_ID_OPTI_82C825,
                .name           = "OPTI621X",
                .init_setup     = init_setup_opti621,
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_opti621,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h
index e33c0d0e0520be1a25084027b8ab1d8c46ec56d1..d651f8bba534f8d1a3e21a6ed49018a00df07531 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.h
+++ b/drivers/ide/pci/pdc202xx_new.h
@@ -58,104 +58,76 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .name           = "PDC20268",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20269,
                .name           = "PDC20269",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20270,
                .name           = "PDC20270",
                .init_setup     = init_setup_pdc20270,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20271,
                .name           = "PDC20271",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 4 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20275,
                .name           = "PDC20275",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 5 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20276,
                .name           = "PDC20276",
                .init_setup     = init_setup_pdc20276,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 6 */
                .vendor         = PCI_VENDOR_ID_PROMISE,
                .device         = PCI_DEVICE_ID_PROMISE_20277,
                .name           = "PDC20277",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
index 82b773bf40cef4d4361d28ec6382de18a1a8dcc4..b8a5ed65f001601233470517a868a67093818c5f 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.h
+++ b/drivers/ide/pci/pdc202xx_old.h
@@ -185,14 +185,11 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .name           = "PDC20246",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
@@ -203,14 +200,11 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .name           = "PDC20262",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
@@ -221,14 +215,11 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .name           = "PDC20263",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
@@ -243,9 +234,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
@@ -256,23 +245,15 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .name           = "PDC20267",
                .init_setup     = init_setup_pdc202xx,
                .init_chipset   = init_chipset_pdc202xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h
index 2cce7c080988ef61079ef803cd31b244c802de25..a30353b16f0c0e7422256cf614cf323bc42e09d9 100644 (file)
--- a/drivers/ide/pci/piix.h
+++ b/drivers/ide/pci/piix.h
@@ -20,13 +20,11 @@ static void init_hwif_piix(ide_hwif_t *);
                .name           = name_str,             \
                .init_setup     = init_setup_piix,      \
                .init_chipset   = init_chipset_piix,    \
-               .init_iops      = NULL,                 \
                .init_hwif      = init_hwif_piix,       \
                .channels       = 2,                    \
                .autodma        = AUTODMA,              \
                .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
                .bootable       = ON_BOARD,             \
-               .extra          = 0,                    \
        }
 
 /*
@@ -43,14 +41,11 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                .device         = PCI_DEVICE_ID_INTEL_82371MX,
                .name           = "MPIIX",
                .init_setup     = init_setup_piix,
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_piix,
                .channels       = 2,
                .autodma        = NODMA,
                .enablebits     = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },
 
        /* 3  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82371SB_1,  "PIIX3"),
@@ -70,14 +65,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
        /* 17 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801DB_10, "ICH4"),
        /* 18 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801EB_1,  "ICH5-SATA"),
        /* 19 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ESB_2,      "ICH5"),
-       /* 20 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ICH6_19,     "ICH6"),
-       {
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .init_setup     = NULL,
-               .bootable       = EOL,
-       }
+       /* 20 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_ICH6_19,    "ICH6")
 };
 
 #endif /* PIIX_H */

diff --git a/drivers/ide/pci/rz1000.h b/drivers/ide/pci/rz1000.h
index 30823afe61718be61959890559a3fd65de00622f..0f4575eed9add094fc82c1a4a5d5e64ab5c7e180 100644 (file)
--- a/drivers/ide/pci/rz1000.h
+++ b/drivers/ide/pci/rz1000.h
@@ -12,33 +12,18 @@ static ide_pci_device_t rz1000_chipsets[] __devinitdata = {
                .vendor         = PCI_VENDOR_ID_PCTECH,
                .device         = PCI_DEVICE_ID_PCTECH_RZ1000,
                .name           = "RZ1000",
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_rz1000,
-               .init_dma       = NULL,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{
                .vendor         = PCI_VENDOR_ID_PCTECH,
                .device         = PCI_DEVICE_ID_PCTECH_RZ1001,
                .name           = "RZ1001",
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_rz1000,
-               .init_dma       = NULL,
                .channels       = 2,
                .autodma        = NODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/sc1200.h b/drivers/ide/pci/sc1200.h
index dc422a805160f2d2bee2da359a2af0b40c24bb9f..22e303d77062bd857ab1b29f730275f7fd41cbb8 100644 (file)
--- a/drivers/ide/pci/sc1200.h
+++ b/drivers/ide/pci/sc1200.h
@@ -16,18 +16,10 @@ static ide_pci_device_t sc1200_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_NS_SCx200_IDE,
                .name           = "SC1200",
                .init_chipset   = init_chipset_sc1200,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_sc1200,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/serverworks.h b/drivers/ide/pci/serverworks.h
index eba6e0bbb0bfb8a87a3931cecaea0198426728e0..8a1d9fe189b21cba1b0eb0528da555e6188e1115 100644 (file)
--- a/drivers/ide/pci/serverworks.h
+++ b/drivers/ide/pci/serverworks.h
@@ -36,61 +36,43 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .name           = "SvrWks OSB4",
                .init_setup     = init_setup_svwks,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
-               .init_dma       = NULL,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_SERVERWORKS,
                .device         = PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,
                .name           = "SvrWks CSB5",
                .init_setup     = init_setup_svwks,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_SERVERWORKS,
                .device         = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,
                .name           = "SvrWks CSB6",
                .init_setup     = init_setup_csb6,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 3 */
                .vendor         = PCI_VENDOR_ID_SERVERWORKS,
                .device         = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,
                .name           = "SvrWks CSB6",
                .init_setup     = init_setup_csb6,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 1,    /* 2 */
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/siimage.h b/drivers/ide/pci/siimage.h
index a47aae5b97066c4a2f7691619f22f7dd7e9fd17c..1f0885e6151c269d3216061393c343e2f4936b7d 100644 (file)
--- a/drivers/ide/pci/siimage.h
+++ b/drivers/ide/pci/siimage.h
@@ -35,9 +35,7 @@ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_siimage,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_CMD,
                .device         = PCI_DEVICE_ID_SII_3112,
@@ -47,9 +45,7 @@ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_siimage,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 2 */
                .vendor         = PCI_VENDOR_ID_CMD,
                .device         = PCI_DEVICE_ID_SII_1210SA,
@@ -59,14 +55,7 @@ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_siimage,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/sis5513.h b/drivers/ide/pci/sis5513.h
index 79f3aa8b631145bd4cbcbb9a1d6f1cfaef26fbb8..5627097b2ffc2dd2363c270701d51ce3c4afd289 100644 (file)
--- a/drivers/ide/pci/sis5513.h
+++ b/drivers/ide/pci/sis5513.h
@@ -16,18 +16,11 @@ static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_SI_5513,
                .name           = "SIS5513",
                .init_chipset   = init_chipset_sis5513,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_sis5513,
                .channels       = 2,
                .autodma        = NOAUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = ON_BOARD,
-               .extra          = 0
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/sl82c105.h b/drivers/ide/pci/sl82c105.h
index f71ee701daad08f75208d4277d0409e8afdb5be5..a4e6e46f6560a37ed4e3d75fcce6899c1cc8f8d7 100644 (file)
--- a/drivers/ide/pci/sl82c105.h
+++ b/drivers/ide/pci/sl82c105.h
@@ -15,19 +15,12 @@ static ide_pci_device_t sl82c105_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_WINBOND_82C105,
                .name           = "W82C105",
                .init_chipset   = init_chipset_sl82c105,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_sl82c105,
                .init_dma       = init_dma_sl82c105,
                .channels       = 2,
                .autodma        = NOAUTODMA,
                .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/slc90e66.h b/drivers/ide/pci/slc90e66.h
index 2f15858cdd5c530bba9866e70ae58b4d21da64f7..0771637685e2eb3277f523431018eb4d5a24c3f2 100644 (file)
--- a/drivers/ide/pci/slc90e66.h
+++ b/drivers/ide/pci/slc90e66.h
@@ -18,18 +18,11 @@ static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
                .device         = PCI_DEVICE_ID_EFAR_SLC90E66_1,
                .name           = "SLC90E66",
                .init_chipset   = init_chipset_slc90e66,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_slc90e66,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h
index 7f6f73783065ae52b640a8bfe1d7e5da219d4df1..d99496e832bd50364b14053e373539646986c82e 100644 (file)
--- a/drivers/ide/pci/triflex.h
+++ b/drivers/ide/pci/triflex.h
@@ -21,14 +21,11 @@ static ide_pci_device_t triflex_devices[] __devinitdata = {
                .device         = PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE,
                .name           = "TRIFLEX",
                .init_chipset   = init_chipset_triflex,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_triflex,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
                .bootable       = ON_BOARD,
-       },{     
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/trm290.h b/drivers/ide/pci/trm290.h
index e18b29e03dc798e2a654a2175c38fa4354d19557..f633c0fa4d90b67643bb26be66a45d40aa9d60b5 100644 (file)
--- a/drivers/ide/pci/trm290.h
+++ b/drivers/ide/pci/trm290.h
@@ -12,20 +12,10 @@ static ide_pci_device_t trm290_chipsets[] __devinitdata = {
                .vendor         = PCI_VENDOR_ID_TEKRAM,
                .device         = PCI_DEVICE_ID_TEKRAM_DC290,
                .name           = "TRM290",
-               .init_chipset   = NULL,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_trm290,
-               .init_dma       = NULL,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/drivers/ide/pci/via82cxxx.h b/drivers/ide/pci/via82cxxx.h
index a47f040e824ef0ce12d479b6195e4d5f8f7c1b86..151c30a7ae2f2a14a2abf205dc5651d8eacea0c1 100644 (file)
--- a/drivers/ide/pci/via82cxxx.h
+++ b/drivers/ide/pci/via82cxxx.h
@@ -21,7 +21,6 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
                .vendor         = PCI_VENDOR_ID_VIA,
                .device         = PCI_DEVICE_ID_VIA_82C586_1,
@@ -32,12 +31,6 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };
 

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 779ee8e93c099bc71756a4f59ad1af97a3dcca53..756c588334b9fb8dc37bcb5ae7d7c428f45968d6 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1546,7 +1546,6 @@ int ide_replace_subdriver(ide_drive_t *drive, const char *driver);
 #define NODMA 0
 #define NOAUTODMA 1
 #define AUTODMA 2
-#define EOL 255
 
 typedef struct ide_pci_enablebit_s {
        u8      reg;    /* byte pci reg holding the enable-bit */