via82cxxx: keep local ide_pci_device_t copy

* Keep local ide_pci_device_t copy in via_init_one().

* Adjust ide_pci_device_t copy according to id->driver_data in via_init_one()
  and remove no longer needed second via82cxxx_chipsets[] entry.

* via82cxxx_chipsets[] -> via82cxxx_chipset.

* Remove IDE_HFLAGS_VIA define.

* Bump driver version.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 691da768
/* /*
* *
* Version 3.49 * Version 3.50
* *
* VIA IDE driver for Linux. Supported southbridges: * VIA IDE driver for Linux. Supported southbridges:
* *
...@@ -432,40 +432,29 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) ...@@ -432,40 +432,29 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
hwif->cbl = via82cxxx_cable_detect(hwif); hwif->cbl = via82cxxx_cable_detect(hwif);
} }
#define IDE_HFLAGS_VIA \ static ide_pci_device_t via82cxxx_chipset __devinitdata = {
(IDE_HFLAG_PIO_NO_BLACKLIST | \ .name = "VP_IDE",
IDE_HFLAG_PIO_NO_DOWNGRADE | \ .init_chipset = init_chipset_via82cxxx,
IDE_HFLAG_POST_SET_MODE | \ .init_hwif = init_hwif_via82cxxx,
IDE_HFLAG_IO_32BIT | \ .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
IDE_HFLAG_BOOTABLE) .host_flags = IDE_HFLAG_PIO_NO_BLACKLIST |
IDE_HFLAG_PIO_NO_DOWNGRADE |
static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = { IDE_HFLAG_POST_SET_MODE |
{ /* 0 */ IDE_HFLAG_IO_32BIT |
.name = "VP_IDE", IDE_HFLAG_BOOTABLE,
.init_chipset = init_chipset_via82cxxx, .pio_mask = ATA_PIO5,
.init_hwif = init_hwif_via82cxxx, .swdma_mask = ATA_SWDMA2,
.enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, .mwdma_mask = ATA_MWDMA2,
.host_flags = IDE_HFLAGS_VIA | IDE_HFLAG_NO_AUTODMA,
.pio_mask = ATA_PIO5,
.swdma_mask = ATA_SWDMA2,
.mwdma_mask = ATA_MWDMA2,
},{ /* 1 */
.name = "VP_IDE",
.init_chipset = init_chipset_via82cxxx,
.init_hwif = init_hwif_via82cxxx,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
.host_flags = IDE_HFLAGS_VIA,
.pio_mask = ATA_PIO5,
.swdma_mask = ATA_SWDMA2,
.mwdma_mask = ATA_MWDMA2,
}
}; };
static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id) 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];
struct pci_dev *isa = NULL; struct pci_dev *isa = NULL;
struct via_isa_bridge *via_config; struct via_isa_bridge *via_config;
u8 idx = id->driver_data;
ide_pci_device_t d;
d = via82cxxx_chipset;
/* /*
* Find the ISA bridge and check we know what it is. * Find the ISA bridge and check we know what it is.
...@@ -477,19 +466,22 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i ...@@ -477,19 +466,22 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
return -ENODEV; return -ENODEV;
} }
if (via_config->flags & VIA_NO_UNMASK) if (idx == 0)
d->host_flags &= ~IDE_HFLAG_UNMASK_IRQS; d.host_flags |= IDE_HFLAG_NO_AUTODMA;
else else
d->host_flags |= IDE_HFLAG_UNMASK_IRQS; d.enablebits[1].reg = d.enablebits[0].reg = 0;
if ((via_config->flags & VIA_NO_UNMASK) == 0)
d.host_flags |= IDE_HFLAG_UNMASK_IRQS;
#ifdef CONFIG_PPC_CHRP #ifdef CONFIG_PPC_CHRP
if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos) if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos)
d->host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
#endif #endif
d->udma_mask = via_config->udma_mask; d.udma_mask = via_config->udma_mask;
return ide_setup_pci_device(dev, d); return ide_setup_pci_device(dev, &d);
} }
static const struct pci_device_id via_pci_tbl[] = { static const struct pci_device_id via_pci_tbl[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment