[PATCH] ide: ide_pci_device_t sanitization

- convert ->isa_ports into ->flags (IDEPCI_FLAG_ISA_PORTS)
- add IDEPCI_FLAG_{OBS_FORCE_PDC,FORCE_MASTER} flags
  and use them in setup-pci.c
- use struct pci_dev ->vendor and ->device fields directly
  in generic.c and serverworks.c
- remove no longer needed debug checks (dev->device != d->device)
- remove ->vendor and ->device fields from ide_pci_device_t
- misc cleanups

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index f474e1dbe6d9ec71d9e166052f60921ce2836ca1..0c3b227fed8464a1ea58e1f4936c96c735523100 100644 (file)
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -525,8 +525,6 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
 {
        ide_pci_device_t *d = &aec62xx_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h
index fe088bc3d1ebede7c0e02f8485dd07d4e930395e..3f272752cca5b30f8dd8de8dd1892f4444632294 100644 (file)
--- a/drivers/ide/pci/aec62xx.h
+++ b/drivers/ide/pci/aec62xx.h
@@ -78,8 +78,6 @@ static void init_dma_aec62xx(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP850UF,
                .name           = "AEC6210",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
@@ -90,8 +88,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = OFF_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP860,
                .name           = "AEC6260",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
@@ -101,8 +97,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP860R,
                .name           = "AEC6260R",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
@@ -113,8 +107,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = NEVER_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP865,
                .name           = "AEC6X80",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,
@@ -124,8 +116,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP865R,
                .name           = "AEC6X80R",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,

diff --git a/drivers/ide/pci/alim15x3.h b/drivers/ide/pci/alim15x3.h
index 748114e9a8b50c7f4e04aee6e89d3a248b8c6b22..989bb9be2927eb4bd377b233fe00e8ba75edc780 100644 (file)
--- a/drivers/ide/pci/alim15x3.h
+++ b/drivers/ide/pci/alim15x3.h
@@ -14,8 +14,6 @@ static void init_dma_ali15x3(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t ali15x3_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_AL,
-               .device         = PCI_DEVICE_ID_AL_M5229,
                .name           = "ALI15X3",
                .init_chipset   = init_chipset_ali15x3,
                .init_hwif      = init_hwif_ali15x3,

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 5093d3cff3eef35f6dfb0d71f491f296e60b3311..05084fd23a7ff8dc9a21d9a566b59420ac0f0202 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -445,7 +445,6 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
 {
        amd_chipset = amd74xx_chipsets + id->driver_data;
        amd_config = amd_ide_chips + id->driver_data;
-       if (dev->device != amd_chipset->device) BUG();
        if (dev->device != amd_config->id) BUG();
        ide_setup_pci_device(dev, amd_chipset);
        return 0;

diff --git a/drivers/ide/pci/amd74xx.h b/drivers/ide/pci/amd74xx.h
index 376f862e9c00845b0a5b185ee52bf818b1abe097..e2a7ae8467f823c7224038c96144ef66fa0e2e96 100644 (file)
--- a/drivers/ide/pci/amd74xx.h
+++ b/drivers/ide/pci/amd74xx.h
@@ -12,8 +12,6 @@ static void init_hwif_amd74xx(ide_hwif_t *);
 
 static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_COBRA_7401,
                .name           = "AMD7401",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -22,8 +20,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_VIPER_7409,
                .name           = "AMD7409",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -32,8 +28,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_VIPER_7411,
                .name           = "AMD7411",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -42,8 +36,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_OPUS_7441,
                .name           = "AMD7441",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -52,8 +44,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
                .bootable       = ON_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_AMD,
-               .device         = PCI_DEVICE_ID_AMD_8111_IDE,
                .name           = "AMD8111",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -63,8 +53,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 5 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
                .name           = "NFORCE",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -74,8 +62,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 6 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,
                .name           = "NFORCE2",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -85,8 +71,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 7 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE,
                .name           = "NFORCE2S",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -96,8 +80,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 8 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
                .name           = "NFORCE2S-SATA",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -107,8 +89,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 9 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE,
                .name           = "NFORCE3",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -118,8 +98,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 10 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE,
                .name           = "NFORCE3S",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -129,8 +107,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 11 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
                .name           = "NFORCE3S-SATA",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,
@@ -140,8 +116,6 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
        {       /* 12 */
-               .vendor         = PCI_VENDOR_ID_NVIDIA,
-               .device         = PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,
                .name           = "NFORCE3S-SATA2",
                .init_chipset   = init_chipset_amd74xx,
                .init_hwif      = init_hwif_amd74xx,

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 18475a89b2389ad1847e4c8dc9c27a0276a49499..bd370856855ef25d58f66b4ce3fbc315040bc7df 100644 (file)
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -458,8 +458,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 
 static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_ATI,
-               .device         = PCI_DEVICE_ID_ATI_IXP_IDE,
                .name           = "ATIIXP",
                .init_chipset   = init_chipset_atiixp,
                .init_hwif      = init_hwif_atiixp,
@@ -481,11 +479,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
 
 static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &atiixp_pci_info[id->driver_data];
-
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &atiixp_pci_info[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index c04122f8a767408459d00f6808382a8c7dd5d164..1f4d08425ecea340d86fa1d431c3f8cb6c654fc9 100644 (file)
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -746,10 +746,7 @@ static void __init init_hwif_cmd64x (ide_hwif_t *hwif)
 
 static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &cmd64x_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &cmd64x_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/cmd64x.h b/drivers/ide/pci/cmd64x.h
index 423e95e8e5bd93aaf401238467797d56781b71de..f5dde235aefbf04acd3d75323b289e2bddc2498a 100644 (file)
--- a/drivers/ide/pci/cmd64x.h
+++ b/drivers/ide/pci/cmd64x.h
@@ -65,8 +65,6 @@ static void init_hwif_cmd64x(ide_hwif_t *);
 
 static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_CMD_643,
                .name           = "CMD643",
                .init_chipset   = init_chipset_cmd64x,
                .init_hwif      = init_hwif_cmd64x,
@@ -74,8 +72,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_CMD_646,
                .name           = "CMD646",
                .init_chipset   = init_chipset_cmd64x,
                .init_hwif      = init_hwif_cmd64x,
@@ -84,8 +80,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .enablebits     = {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
                .bootable       = ON_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device = PCI_DEVICE_ID_CMD_648,
                .name           = "CMD648",
                .init_chipset   = init_chipset_cmd64x,
                .init_hwif      = init_hwif_cmd64x,
@@ -93,8 +87,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_CMD_649,
                .name           = "CMD649",
                .init_chipset   = init_chipset_cmd64x,
                .init_hwif      = init_hwif_cmd64x,

diff --git a/drivers/ide/pci/cs5520.h b/drivers/ide/pci/cs5520.h
index 339530613a7f985fe1fdaf6a0988abaaa3e2a98d..f2cdc5343b3e39ee82e352e88f5ff2421d7457bf 100644 (file)
--- a/drivers/ide/pci/cs5520.h
+++ b/drivers/ide/pci/cs5520.h
@@ -13,28 +13,24 @@ static void cs5520_init_setup_dma(struct pci_dev *dev, struct ide_pci_device_s *
 
 static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
        {
-               .vendor         = PCI_VENDOR_ID_CYRIX,
-               .device         = PCI_DEVICE_ID_CYRIX_5510,
                .name           = "Cyrix 5510",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
                .init_hwif      = init_hwif_cs5520,
-               .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_ISA_PORTS,
        },
        {
-               .vendor         = PCI_VENDOR_ID_CYRIX,
-               .device         = PCI_DEVICE_ID_CYRIX_5520,
                .name           = "Cyrix 5520",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
                .init_hwif      = init_hwif_cs5520,
-               .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_ISA_PORTS,
        }
 };
 

diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 7544904e90a3ae030788c93a5813c590d30e50cc..19c97e89a9b0949243df0d47db352c3c5c16cf01 100644 (file)
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -406,10 +406,7 @@ static void __init init_hwif_cs5530 (ide_hwif_t *hwif)
 
 static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &cs5530_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &cs5530_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/cs5530.h b/drivers/ide/pci/cs5530.h
index cf651f2a9c6f32e17e8401d86ba4a417ad7e4905..08fe18a09bb95a059ac23e4828e93b52003fc422 100644 (file)
--- a/drivers/ide/pci/cs5530.h
+++ b/drivers/ide/pci/cs5530.h
@@ -12,14 +12,13 @@ static void init_hwif_cs5530(ide_hwif_t *);
 
 static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_CYRIX,
-               .device         = PCI_DEVICE_ID_CYRIX_5530_IDE,
                .name           = "CS5530",
                .init_chipset   = init_chipset_cs5530,
                .init_hwif      = init_hwif_cs5530,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_FORCE_MASTER,
        }
 };
 

diff --git a/drivers/ide/pci/cy82c693.h b/drivers/ide/pci/cy82c693.h
index 8a22479f6b7e9279be8ee8f9cb550dacf17949d1..cccb69b4de59f236068da67fee593e940088f8c4 100644 (file)
--- a/drivers/ide/pci/cy82c693.h
+++ b/drivers/ide/pci/cy82c693.h
@@ -70,8 +70,6 @@ static void init_iops_cy82c693(ide_hwif_t *);
 
 static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_CONTAQ,
-               .device         = PCI_DEVICE_ID_CONTAQ_82C693,
                .name           = "CY82C693",
                .init_chipset   = init_chipset_cy82c693,
                .init_iops      = init_iops_cy82c693,

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index ca9997738ab1a301ed8e03c6c826d2ee5e56b3ad..e73279563a58d7f0f64a61fb64a15a51f7785672 100644 (file)
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -77,8 +77,6 @@ static void __init init_hwif_generic (ide_hwif_t *hwif)
 
        if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
                ide_pci_device_t *unknown = unknown_chipset;
-//             unknown->vendor = dev->vendor;
-//             unknown->device = dev->device;
                init_setup_unknown(dev, unknown);
                return 1;
        }
@@ -99,15 +97,13 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
        ide_pci_device_t *d = &generic_chipsets[id->driver_data];
        u16 command;
 
-       if (dev->device != d->device)
-               BUG();
-       if ((d->vendor == PCI_VENDOR_ID_UMC) &&
-           (d->device == PCI_DEVICE_ID_UMC_UM8886A) &&
+       if (dev->vendor == PCI_VENDOR_ID_UMC &&
+           dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
            (!(PCI_FUNC(dev->devfn) & 1)))
                return 1; /* UM8886A/BF pair */
 
-       if ((d->vendor == PCI_VENDOR_ID_OPTI) &&
-           (d->device == PCI_DEVICE_ID_OPTI_82C558) &&
+       if (dev->vendor == PCI_VENDOR_ID_OPTI &&
+           dev->device == PCI_DEVICE_ID_OPTI_82C558 &&
            (!(PCI_FUNC(dev->devfn) & 1)))
                return 1;
 

diff --git a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
index fdaaf211339b9c0fb3a5d489cc406629850beae9..a6669202680cb46be34fc11592827282d5975b62 100644 (file)
--- a/drivers/ide/pci/generic.h
+++ b/drivers/ide/pci/generic.h
@@ -10,8 +10,6 @@ static void init_hwif_generic(ide_hwif_t *);
 
 static ide_pci_device_t generic_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_NS,
-               .device         = PCI_DEVICE_ID_NS_87410,
                .name           = "NS87410",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -20,8 +18,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                .bootable       = ON_BOARD,
         },{    /* 1 */
-               .vendor         = PCI_VENDOR_ID_PCTECH,
-               .device         = PCI_DEVICE_ID_PCTECH_SAMURAI_IDE,
                .name           = "SAMURAI",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -29,8 +25,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_HOLTEK,
-               .device         = PCI_DEVICE_ID_HOLTEK_6565,
                .name           = "HT6565",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -38,8 +32,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8673F,
                .name           = "UM8673F",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -47,8 +39,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8886A,
                .name           = "UM8886A",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -56,8 +46,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 5 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8886BF,
                .name           = "UM8886BF",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -65,8 +53,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 6 */
-               .vendor         = PCI_VENDOR_ID_HINT,
-               .device         = PCI_DEVICE_ID_HINT_VXPROII_IDE,
                .name           = "HINT_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -74,8 +60,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 7 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_82C561,
                .name           = "VIA_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -83,8 +67,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 8 */
-               .vendor         = PCI_VENDOR_ID_OPTI,
-               .device         = PCI_DEVICE_ID_OPTI_82C558,
                .name           = "OPTI621V",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -92,8 +74,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 9 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_8237_SATA,
                .name           = "VIA8237SATA",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -101,8 +81,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{ /* 10 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO,
                .name           = "Piccolo0102",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -110,8 +88,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{ /* 11 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,
                .name           = "Piccolo0103",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -119,8 +95,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{ /* 12 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,
                .name           = "Piccolo0105",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -133,8 +107,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
 #if 0
 static ide_pci_device_t unknown_chipset[] __devinitdata = {
        {       /* 0 */
-               .vendor         = 0,
-               .device         = 0,
                .name           = "PCI_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,

diff --git a/drivers/ide/pci/hpt34x.h b/drivers/ide/pci/hpt34x.h
index 9fa3813a5ef74f4be1628f524ae4ec7835765a68..465f5671511619336ae07a2df60832e59bce0eac 100644 (file)
--- a/drivers/ide/pci/hpt34x.h
+++ b/drivers/ide/pci/hpt34x.h
@@ -18,8 +18,6 @@ static void init_hwif_hpt34x(ide_hwif_t *);
 
 static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT343,
                .name           = "HPT34X",
                .init_chipset   = init_chipset_hpt34x,
                .init_hwif      = init_hwif_hpt34x,

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index d3129b2a9b2c639fad2add6c9ec14042c43ff997..5ca4a581f97ced3039523606c66f4c57ff8bdeec 100644 (file)
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1241,8 +1241,6 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
 {
        ide_pci_device_t *d = &hpt366_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/hpt366.h b/drivers/ide/pci/hpt366.h
index 8987b25c8619ef7c52e3b9fc450a842f75615fbc..7b3d8b4109df225f9ba669537b141d9b577f450c 100644 (file)
--- a/drivers/ide/pci/hpt366.h
+++ b/drivers/ide/pci/hpt366.h
@@ -425,8 +425,6 @@ static void init_dma_hpt366(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT366,
                .name           = "HPT366",
                .init_setup     = init_setup_hpt366,
                .init_chipset   = init_chipset_hpt366,
@@ -437,8 +435,6 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .bootable       = OFF_BOARD,
                .extra          = 240
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT372,
                .name           = "HPT372A",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
@@ -448,8 +444,6 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT302,
                .name           = "HPT302",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
@@ -459,8 +453,6 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT371,
                .name           = "HPT371",
                .init_setup     = init_setup_hpt37x,
                .init_chipset   = init_chipset_hpt366,
@@ -470,8 +462,6 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_TTI,
-               .device         = PCI_DEVICE_ID_TTI_HPT374,
                .name           = "HPT374",
                .init_setup     = init_setup_hpt374,
                .init_chipset   = init_chipset_hpt366,

diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
index 873e56e6a4bd95b1ff7a0ea293b0fc9b5cdaaf1f..b65ce08775be5e48d22db8b95ca47a1b7f4e36a1 100644 (file)
--- a/drivers/ide/pci/it8172.c
+++ b/drivers/ide/pci/it8172.c
@@ -288,11 +288,10 @@ static void __init init_hwif_it8172 (ide_hwif_t *hwif)
 
 static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &it8172_chipsets[id->driver_data];
         if ((!(PCI_FUNC(dev->devfn) & 1) ||
             (!((dev->class >> 8) == PCI_CLASS_STORAGE_IDE))))
                 return 1; /* IT8172 is more than only a IDE controller */
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &it8172_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/it8172.h b/drivers/ide/pci/it8172.h
index e80bc6283af78d3b86b4575f7a3395faabcedd5f..fbc2b64003a468ece796282cc6239f541a70b56c 100644 (file)
--- a/drivers/ide/pci/it8172.h
+++ b/drivers/ide/pci/it8172.h
@@ -20,8 +20,6 @@ static void init_hwif_it8172(ide_hwif_t *);
 
 static ide_pci_device_t it8172_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_ITE,
-               .device         = PCI_DEVICE_ID_ITE_IT8172G,
                .name           = "IT8172G",
                .init_setup     = init_setup_it8172,
                .init_chipset   = init_chipset_it8172,

diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 279c0323c9ba99b7a2d7cb0be667d0093a7566c1..1809edddbbc57ebe4ca41ec1b63e6613fe52bee1 100644 (file)
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -219,10 +219,7 @@ static void __init init_hwif_ns87415 (ide_hwif_t *hwif)
 
 static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &ns87415_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &ns87415_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/ns87415.h b/drivers/ide/pci/ns87415.h
index 8c4c1b8fcbbb8f213161605624895fbd6fb6b87a..a2594c7fd5037a203b1fc0b0946b9e8a22348469 100644 (file)
--- a/drivers/ide/pci/ns87415.h
+++ b/drivers/ide/pci/ns87415.h
@@ -9,8 +9,6 @@ static void init_hwif_ns87415(ide_hwif_t *);
 
 static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_NS,
-               .device         = PCI_DEVICE_ID_NS_87415,
                .name           = "NS87415",
                .init_hwif      = init_hwif_ns87415,
                .channels       = 2,

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 8a6c316497c400c93c4f6b0a51c10dc2f7dd5f96..3ca7db7d5bdfbd133033eb18294f27671fdc5cdf 100644 (file)
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -355,10 +355,7 @@ static void __init init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
 
 static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &opti621_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &opti621_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/opti621.h b/drivers/ide/pci/opti621.h
index 8860eeb8a2f876d24a556744a6d431393078ff8b..a0e6504c301f26b538bd906146472fbf78ada000 100644 (file)
--- a/drivers/ide/pci/opti621.h
+++ b/drivers/ide/pci/opti621.h
@@ -10,8 +10,6 @@ static void init_hwif_opti621(ide_hwif_t *);
 
 static ide_pci_device_t opti621_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_OPTI,
-               .device         = PCI_DEVICE_ID_OPTI_82C621,
                .name           = "OPTI621",
                .init_setup     = init_setup_opti621,
                .init_hwif      = init_hwif_opti621,
@@ -20,8 +18,6 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
                .bootable       = ON_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_OPTI,
-               .device         = PCI_DEVICE_ID_OPTI_82C825,
                .name           = "OPTI621X",
                .init_setup     = init_setup_opti621,
                .init_hwif      = init_hwif_opti621,

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index f753c6316bfc1f01a59746ccdd540a32e183ace8..fbc0bd81e536fdef77f6e58812f36ab29e1f7125 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -514,8 +514,6 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
 {
        ide_pci_device_t *d = &pdcnew_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h
index d651f8bba534f8d1a3e21a6ed49018a00df07531..0abec0ed7d57ce8d0025a7f2e74f57e1b4304cd0 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.h
+++ b/drivers/ide/pci/pdc202xx_new.h
@@ -53,8 +53,6 @@ static void init_hwif_pdc202new(ide_hwif_t *);
 
 static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20268,
                .name           = "PDC20268",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
@@ -63,8 +61,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20269,
                .name           = "PDC20269",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
@@ -73,8 +69,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20270,
                .name           = "PDC20270",
                .init_setup     = init_setup_pdc20270,
                .init_chipset   = init_chipset_pdcnew,
@@ -86,8 +80,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
 #endif
                .bootable       = OFF_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20271,
                .name           = "PDC20271",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
@@ -96,8 +88,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20275,
                .name           = "PDC20275",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
@@ -106,8 +96,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{     /* 5 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20276,
                .name           = "PDC20276",
                .init_setup     = init_setup_pdc20276,
                .init_chipset   = init_chipset_pdcnew,
@@ -119,8 +107,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
 #endif
                .bootable       = OFF_BOARD,
        },{     /* 6 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20277,
                .name           = "PDC20277",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index aa04a13c1f5307f0abcbc4ae55e1d5fc4ecd9cf6..99fbe04ec6ed4bb9b5ba9e44625a6a368bd795cc 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -884,8 +884,6 @@ static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_dev
 {
        ide_pci_device_t *d = &pdc202xx_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
index b8a5ed65f001601233470517a868a67093818c5f..95ea2c8aa6ddcdbbbd0918abbebf7d67c356351a 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.h
+++ b/drivers/ide/pci/pdc202xx_old.h
@@ -180,8 +180,6 @@ static void init_dma_pdc202xx(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20246,
                .name           = "PDC20246",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
@@ -195,8 +193,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .bootable       = OFF_BOARD,
                .extra          = 16,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20262,
                .name           = "PDC20262",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
@@ -209,9 +205,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
+               .flags          = IDEPCI_FLAG_FORCE_PDC,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20263,
                .name           = "PDC20263",
                .init_setup     = init_setup_pdc202ata4,
                .init_chipset   = init_chipset_pdc202xx,
@@ -225,8 +220,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .bootable       = OFF_BOARD,
                .extra          = 48,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20265,
                .name           = "PDC20265",
                .init_setup     = init_setup_pdc20265,
                .init_chipset   = init_chipset_pdc202xx,
@@ -239,9 +232,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
 #endif
                .bootable       = OFF_BOARD,
                .extra          = 48,
+               .flags          = IDEPCI_FLAG_FORCE_PDC,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20267,
                .name           = "PDC20267",
                .init_setup     = init_setup_pdc202xx,
                .init_chipset   = init_chipset_pdc202xx,

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index c7d68784d7330c427df0842ad46b573a10d86b05..3d21a5b5e1843ccbc33186a7978d77bc27ec1d6e 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -744,8 +744,6 @@ static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_
 {
        ide_pci_device_t *d = &piix_pci_info[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h
index a30353b16f0c0e7422256cf614cf323bc42e09d9..f71db14aee76a640876128e11c1748e101c04cec 100644 (file)
--- a/drivers/ide/pci/piix.h
+++ b/drivers/ide/pci/piix.h
@@ -13,10 +13,8 @@ static void init_setup_piix(struct pci_dev *, ide_pci_device_t *);
 static unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *);
 static void init_hwif_piix(ide_hwif_t *);
 
-#define DECLARE_PIIX_DEV(pci_id, name_str) \
+#define DECLARE_PIIX_DEV(name_str) \
        {                                               \
-               .vendor         = PCI_VENDOR_ID_INTEL,  \
-               .device         = pci_id,               \
                .name           = name_str,             \
                .init_setup     = init_setup_piix,      \
                .init_chipset   = init_chipset_piix,    \
@@ -33,12 +31,10 @@ static void init_hwif_piix(ide_hwif_t *);
  */
  
 static ide_pci_device_t piix_pci_info[] __devinitdata = {
-       /* 0  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82371FB_0,  "PIIXa"),
-       /* 1  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82371FB_1,  "PIIXb"),
+       /*  0 */ DECLARE_PIIX_DEV("PIIXa"),
+       /*  1 */ DECLARE_PIIX_DEV("PIIXb"),
 
        {       /* 2 */
-               .vendor         = PCI_VENDOR_ID_INTEL,
-               .device         = PCI_DEVICE_ID_INTEL_82371MX,
                .name           = "MPIIX",
                .init_setup     = init_setup_piix,
                .init_hwif      = init_hwif_piix,
@@ -48,24 +44,24 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                .bootable       = ON_BOARD,
        },
 
-       /* 3  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82371SB_1,  "PIIX3"),
-       /* 4  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82371AB,    "PIIX4"),
-       /* 5  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801AB_1,  "ICH0"),
-       /* 6  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82443MX_1,  "PIIX4"),
-       /* 7  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801AA_1,  "ICH"),
-       /* 8  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82372FB_1,  "PIIX4"),
-       /* 9  */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82451NX,    "PIIX4"),
-       /* 10 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801BA_9,  "ICH2"),
-       /* 11 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801BA_8,  "ICH2M"),
-       /* 12 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801CA_10, "ICH3M"),
-       /* 13 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801CA_11, "ICH3"),
-       /* 14 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801DB_11, "ICH4"),
-       /* 15 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801EB_11, "ICH5"),
-       /* 16 */ DECLARE_PIIX_DEV(PCI_DEVICE_ID_INTEL_82801E_11,  "C-ICH"),
-       /* 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")
+       /*  3 */ DECLARE_PIIX_DEV("PIIX3"),
+       /*  4 */ DECLARE_PIIX_DEV("PIIX4"),
+       /*  5 */ DECLARE_PIIX_DEV("ICH0"),
+       /*  6 */ DECLARE_PIIX_DEV("PIIX4"),
+       /*  7 */ DECLARE_PIIX_DEV("ICH"),
+       /*  8 */ DECLARE_PIIX_DEV("PIIX4"),
+       /*  9 */ DECLARE_PIIX_DEV("PIIX4"),
+       /* 10 */ DECLARE_PIIX_DEV("ICH2"),
+       /* 11 */ DECLARE_PIIX_DEV("ICH2M"),
+       /* 12 */ DECLARE_PIIX_DEV("ICH3M"),
+       /* 13 */ DECLARE_PIIX_DEV("ICH3"),
+       /* 14 */ DECLARE_PIIX_DEV("ICH4"),
+       /* 15 */ DECLARE_PIIX_DEV("ICH5"),
+       /* 16 */ DECLARE_PIIX_DEV("C-ICH"),
+       /* 17 */ DECLARE_PIIX_DEV("ICH4"),
+       /* 18 */ DECLARE_PIIX_DEV("ICH5-SATA"),
+       /* 19 */ DECLARE_PIIX_DEV("ICH5"),
+       /* 20 */ DECLARE_PIIX_DEV("ICH6")
 };
 
 #endif /* PIIX_H */

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 963b8458ba1a7456c850c8ec6e22f9e16e782872..78669068da4950eaf0be1f24a68424c8f6cda5b5 100644 (file)
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -56,10 +56,7 @@ static void __init init_hwif_rz1000 (ide_hwif_t *hwif)
 
 static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &rz1000_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &rz1000_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/rz1000.h b/drivers/ide/pci/rz1000.h
index 0f4575eed9add094fc82c1a4a5d5e64ab5c7e180..5c7c611c52d7194fae694482551c8941fd6fb102 100644 (file)
--- a/drivers/ide/pci/rz1000.h
+++ b/drivers/ide/pci/rz1000.h
@@ -8,17 +8,13 @@
 static void init_hwif_rz1000(ide_hwif_t *);
 
 static ide_pci_device_t rz1000_chipsets[] __devinitdata = {
-{
-               .vendor         = PCI_VENDOR_ID_PCTECH,
-               .device         = PCI_DEVICE_ID_PCTECH_RZ1000,
+       {
                .name           = "RZ1000",
                .init_hwif      = init_hwif_rz1000,
                .channels       = 2,
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{
-               .vendor         = PCI_VENDOR_ID_PCTECH,
-               .device         = PCI_DEVICE_ID_PCTECH_RZ1001,
                .name           = "RZ1001",
                .init_hwif      = init_hwif_rz1000,
                .channels       = 2,

diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 29a263addcde53e725a22f65f8cd0cdb5d75dc47..58d1e58740384ddbd491c0484c39e584b0af4c08 100644 (file)
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -547,10 +547,7 @@ static void __init init_hwif_sc1200 (ide_hwif_t *hwif)
 
 static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &sc1200_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &sc1200_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/sc1200.h b/drivers/ide/pci/sc1200.h
index 22e303d77062bd857ab1b29f730275f7fd41cbb8..c58e689883c5b6ac0bbf82bcaa84b158bf7fbb26 100644 (file)
--- a/drivers/ide/pci/sc1200.h
+++ b/drivers/ide/pci/sc1200.h
@@ -12,8 +12,6 @@ static void init_hwif_sc1200(ide_hwif_t *);
 
 static ide_pci_device_t sc1200_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_NS,
-               .device         = PCI_DEVICE_ID_NS_SCx200_IDE,
                .name           = "SC1200",
                .init_chipset   = init_chipset_sc1200,
                .init_hwif      = init_hwif_sc1200,

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 3418232fc74911b988d78f28a044602f05d9de81..27d907c9bcafc961ce24d9d05b9a28de55eede24 100644 (file)
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -777,8 +777,8 @@ static void __init init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d)
                d->autodma = AUTODMA;
 #endif
 
-       d->channels = (((d->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||
-                       (d->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2)) &&
+       d->channels = ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||
+                       dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2) &&
                       (!(PCI_FUNC(dev->devfn) & 1))) ? 1 : 2;
 
        ide_setup_pci_device(dev, d);
@@ -798,8 +798,6 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device
 {
        ide_pci_device_t *d = &serverworks_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }

diff --git a/drivers/ide/pci/serverworks.h b/drivers/ide/pci/serverworks.h
index 8a1d9fe189b21cba1b0eb0528da555e6188e1115..aa8bd8b9d2974dfa963cd4a5fcd7c303a2ae9e7e 100644 (file)
--- a/drivers/ide/pci/serverworks.h
+++ b/drivers/ide/pci/serverworks.h
@@ -31,8 +31,6 @@ static void init_dma_svwks(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_SERVERWORKS,
-               .device         = PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,
                .name           = "SvrWks OSB4",
                .init_setup     = init_setup_svwks,
                .init_chipset   = init_chipset_svwks,
@@ -41,8 +39,6 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 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,
@@ -52,8 +48,6 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 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,
@@ -63,8 +57,6 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 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,

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index d8e739f1cf5d61988e4cf9bf10bca1fbea840acd..0187aafac0521a4ed02483645cb93daadf63a291 100644 (file)
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -757,8 +757,6 @@ pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
 static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
        {
         /* Channel 0 */
-        .vendor = PCI_VENDOR_ID_SGI,
-        .device = PCI_DEVICE_ID_SGI_IOC4,
         .name = "SGIIOC4",
         .init_hwif = ide_init_sgiioc4,
         .init_dma = ide_dma_sgiioc4,
@@ -772,16 +770,7 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
 static int __devinit
 sgiioc4_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &sgiioc4_chipsets[id->driver_data];
-       if (dev->device != d->device) {
-               printk(KERN_ERR "Error in %s(dev 0x%p | id 0x%p )\n",
-                      __FUNCTION__, (void *) dev, (void *) id);
-               BUG();
-       }
-
-       if (pci_init_sgiioc4(dev, d))
-               return 0;
-
+       pci_init_sgiioc4(dev, &sgiioc4_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index ff530bf148c206d280b64d3361244ccfa5e945d1..5896b4d889ea4d8aa7a445194b849ae143389c80 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -1183,10 +1183,7 @@ static void __init init_hwif_siimage (ide_hwif_t *hwif)
  
 static int __devinit siimage_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &siimage_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &siimage_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/siimage.h b/drivers/ide/pci/siimage.h
index 1f0885e6151c269d3216061393c343e2f4936b7d..1aeb1500c20dbfd0090be1ef0b093fa48a091720 100644 (file)
--- a/drivers/ide/pci/siimage.h
+++ b/drivers/ide/pci/siimage.h
@@ -27,8 +27,6 @@ static void init_hwif_siimage(ide_hwif_t *);
 
 static ide_pci_device_t siimage_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_SII_680,
                .name           = "SiI680",
                .init_chipset   = init_chipset_siimage,
                .init_iops      = init_iops_siimage,
@@ -37,8 +35,6 @@ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_SII_3112,
                .name           = "SiI3112 Serial ATA",
                .init_chipset   = init_chipset_siimage,
                .init_iops      = init_iops_siimage,
@@ -47,8 +43,6 @@ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_CMD,
-               .device         = PCI_DEVICE_ID_SII_1210SA,
                .name           = "Adaptec AAR-1210SA",
                .init_chipset   = init_chipset_siimage,
                .init_iops      = init_iops_siimage,

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 6c56f5670202b3093589ec8555602aab09549878..6254eab6d5972b9a6a65fde9b7ab99f38403dc48 100644 (file)
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -946,10 +946,7 @@ static void __init init_hwif_sis5513 (ide_hwif_t *hwif)
 
 static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &sis5513_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &sis5513_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/sis5513.h b/drivers/ide/pci/sis5513.h
index 5627097b2ffc2dd2363c270701d51ce3c4afd289..d66e9a74b9d60775a3430dd788903012fc10f5dc 100644 (file)
--- a/drivers/ide/pci/sis5513.h
+++ b/drivers/ide/pci/sis5513.h
@@ -12,8 +12,6 @@ static void init_hwif_sis5513(ide_hwif_t *);
 
 static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_SI,
-               .device         = PCI_DEVICE_ID_SI_5513,
                .name           = "SIS5513",
                .init_chipset   = init_chipset_sis5513,
                .init_hwif      = init_hwif_sis5513,

diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 516f799cbcf091c358263967b1ece096aed1d6f6..4706ebfbab2a3f4202e41feb75a8457df9531a18 100644 (file)
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -483,10 +483,7 @@ static void __init init_hwif_sl82c105(ide_hwif_t *hwif)
 
 static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &sl82c105_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &sl82c105_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/sl82c105.h b/drivers/ide/pci/sl82c105.h
index a4e6e46f6560a37ed4e3d75fcce6899c1cc8f8d7..f2d34a254b9e987e6ca6eb722d121ffa7e958159 100644 (file)
--- a/drivers/ide/pci/sl82c105.h
+++ b/drivers/ide/pci/sl82c105.h
@@ -11,8 +11,6 @@ static void init_dma_sl82c105(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t sl82c105_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_WINBOND,
-               .device         = PCI_DEVICE_ID_WINBOND_82C105,
                .name           = "W82C105",
                .init_chipset   = init_chipset_sl82c105,
                .init_hwif      = init_hwif_sl82c105,

diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 7fa07e13ac8373ec6c6f21ef3c7c6cc9d4925dbd..7842242701df174740d18cbed813e799ed46e89f 100644 (file)
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -366,10 +366,7 @@ static void __init init_hwif_slc90e66 (ide_hwif_t *hwif)
 
 static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &slc90e66_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &slc90e66_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/slc90e66.h b/drivers/ide/pci/slc90e66.h
index 0771637685e2eb3277f523431018eb4d5a24c3f2..57017958c6f1302fcfb88a5b03b60e689f9b1b90 100644 (file)
--- a/drivers/ide/pci/slc90e66.h
+++ b/drivers/ide/pci/slc90e66.h
@@ -14,8 +14,6 @@ static void init_hwif_slc90e66(ide_hwif_t *);
 
 static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_EFAR,
-               .device         = PCI_DEVICE_ID_EFAR_SLC90E66_1,
                .name           = "SLC90E66",
                .init_chipset   = init_chipset_slc90e66,
                .init_hwif      = init_hwif_slc90e66,

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index f7ff2f4d101d968f8f295322b1021df488b32603..fc618653123139e29683df99340347d225cd9d03 100644 (file)
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -220,13 +220,9 @@ static unsigned int __init init_chipset_triflex(struct pci_dev *dev,
 static int __devinit triflex_init_one(struct pci_dev *dev, 
                const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &triflex_devices[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &triflex_devices[id->driver_data]);
        triflex_dev = dev;
-       
+
        return 0;
 }
 

diff --git a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h
index d99496e832bd50364b14053e373539646986c82e..f826608f5ce6db322d51bf85195f37c675f32cb1 100644 (file)
--- a/drivers/ide/pci/triflex.h
+++ b/drivers/ide/pci/triflex.h
@@ -17,8 +17,6 @@ static void init_hwif_triflex(ide_hwif_t *);
 
 static ide_pci_device_t triflex_devices[] __devinitdata = {
        {
-               .vendor         = PCI_VENDOR_ID_COMPAQ,
-               .device         = PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE,
                .name           = "TRIFLEX",
                .init_chipset   = init_chipset_triflex,
                .init_hwif      = init_hwif_triflex,

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 8a1f88faca71c508d614b851fd9c3aac0db4ff2a..c074089081807e5cbd5b806b87053186223a54c8 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -397,10 +397,7 @@ void __init init_hwif_trm290 (ide_hwif_t *hwif)
 
 static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &trm290_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &trm290_chipsets[id->driver_data]);
        return 0;
 }
 

diff --git a/drivers/ide/pci/trm290.h b/drivers/ide/pci/trm290.h
index f633c0fa4d90b67643bb26be66a45d40aa9d60b5..6c001d4d55b31dd4926bbe9b841df649cd2cb603 100644 (file)
--- a/drivers/ide/pci/trm290.h
+++ b/drivers/ide/pci/trm290.h
@@ -9,8 +9,6 @@ extern void init_hwif_trm290(ide_hwif_t *);
 
 static ide_pci_device_t trm290_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_TEKRAM,
-               .device         = PCI_DEVICE_ID_TEKRAM_DC290,
                .name           = "TRM290",
                .init_hwif      = init_hwif_trm290,
                .channels       = 2,

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 044b6c492f886407ac948872c31ce8366fae8a67..47c241d26bdc59bcababe67261f812fb965b0dcc 100644 (file)
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -609,16 +609,13 @@ static void __init init_hwif_via82cxxx(ide_hwif_t *hwif)
 
 static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &via82cxxx_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &via82cxxx_chipsets[id->driver_data]);
        return 0;
 }
 
 static struct pci_device_id via_pci_tbl[] = {
        { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+       { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, via_pci_tbl);

diff --git a/drivers/ide/pci/via82cxxx.h b/drivers/ide/pci/via82cxxx.h
index 151c30a7ae2f2a14a2abf205dc5651d8eacea0c1..6504ca08a0f426e62bc07c3550effd2755e55621 100644 (file)
--- a/drivers/ide/pci/via82cxxx.h
+++ b/drivers/ide/pci/via82cxxx.h
@@ -12,18 +12,6 @@ static void init_hwif_via82cxxx(ide_hwif_t *);
 
 static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_82C576_1,
-               .name           = "VP_IDE",
-               .init_chipset   = init_chipset_via82cxxx,
-               .init_hwif      = init_hwif_via82cxxx,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-       },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_82C586_1,
                .name           = "VP_IDE",
                .init_chipset   = init_chipset_via82cxxx,
                .init_hwif      = init_hwif_via82cxxx,

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 993e030c84bc46fc2df9d437f9697e3e80b2c130..b485e6b706c89a4ffb1f84327f27c4316ab7677d 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -285,14 +285,8 @@ second_chance_to_dma:
 
 void ide_setup_pci_noise (struct pci_dev *dev, ide_pci_device_t *d)
 {
-       if ((d->vendor != dev->vendor) && (d->device != dev->device)) {
-               printk(KERN_INFO "%s: unknown IDE controller at PCI slot "
-                       "%s, VID=%04x, DID=%04x\n",
-                       d->name, pci_name(dev), dev->vendor, dev->device);
-        } else {
-               printk(KERN_INFO "%s: IDE controller at PCI slot %s\n",
-                       d->name, pci_name(dev));
-       }
+       printk(KERN_INFO "%s: IDE controller at PCI slot %s\n",
+                        d->name, pci_name(dev));
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
@@ -422,8 +416,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
        unsigned long ctl = 0, base = 0;
        ide_hwif_t *hwif;
 
-       if(!d->isa_ports)
-       {
+       if ((d->flags & IDEPCI_FLAG_ISA_PORTS) == 0) {
                /*  Possibly we should fail if these checks report true */
                ide_pci_check_iomem(dev, d, 2*port);
                ide_pci_check_iomem(dev, d, 2*port+1);
@@ -495,9 +488,7 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
                         * Set up BM-DMA capability
                         * (PnP BIOS should have done this)
                         */
-                       if (!((d->device == PCI_DEVICE_ID_CYRIX_5530_IDE && d->vendor == PCI_VENDOR_ID_CYRIX)
-                           ||(d->device == PCI_DEVICE_ID_NS_SCx200_IDE && d->vendor == PCI_VENDOR_ID_NS)))
-                       {
+                       if ((d->flags & IDEPCI_FLAG_FORCE_MASTER) == 0) {
                                /*
                                 * default DMA off if we had to
                                 * configure it here
@@ -613,9 +604,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int autodma,
                 * by the bios for raid purposes. 
                 * Skip the normal "is it enabled" test for those.
                 */
-               if (((d->vendor == PCI_VENDOR_ID_PROMISE) &&
-                    ((d->device == PCI_DEVICE_ID_PROMISE_20262) ||
-                     (d->device == PCI_DEVICE_ID_PROMISE_20265))) &&
+               if ((d->flags & IDEPCI_FLAG_FORCE_PDC) &&
                    (secondpdc++==1) && (port==1))
                        goto controller_ok;
                        

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0aef41843abf8ecf5a01abab63f780600ac81622..2cc8d79dd71b209217b62a4e820a8e5fb7c74cd0 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1552,9 +1552,15 @@ typedef struct ide_pci_enablebit_s {
        u8      val;    /* value of masked reg when "enabled" */
 } ide_pci_enablebit_t;
 
+enum {
+       /* Uses ISA control ports not PCI ones. */
+       IDEPCI_FLAG_ISA_PORTS           = (1 << 0),
+
+       IDEPCI_FLAG_FORCE_MASTER        = (1 << 1),
+       IDEPCI_FLAG_FORCE_PDC           = (1 << 2),
+};
+
 typedef struct ide_pci_device_s {
-       u16                     vendor;
-       u16                     device;
        char                    *name;
        void                    (*init_setup)(struct pci_dev *, struct ide_pci_device_s *);
        void                    (*init_setup_dma)(struct pci_dev *, struct ide_pci_device_s *, ide_hwif_t *);
@@ -1568,7 +1574,7 @@ typedef struct ide_pci_device_s {
        u8                      bootable;
        unsigned int            extra;
        struct ide_pci_device_s *next;
-       u8                      isa_ports;      /* Uses ISA control ports not PCI ones */
+       u8                      flags;
 } ide_pci_device_t;
 
 extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);