ide: remove write-only hwif->hw
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -387,14 +387,15 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
|
||||
return NULL; /* no room in ide_hwifs[] */
|
||||
if (hwif->io_ports[IDE_DATA_OFFSET] != base ||
|
||||
hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {
|
||||
memset(&hwif->hw, 0, sizeof(hwif->hw));
|
||||
hw_regs_t hw;
|
||||
|
||||
memset(&hw, 0, sizeof(hw));
|
||||
#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT
|
||||
ide_std_init_ports(&hwif->hw, base, (ctl | 2));
|
||||
hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0;
|
||||
ide_std_init_ports(&hw, base, ctl | 2);
|
||||
#else
|
||||
ide_init_hwif_ports(&hwif->hw, base, (ctl | 2), NULL);
|
||||
ide_init_hwif_ports(&hw, base, ctl | 2, NULL);
|
||||
#endif
|
||||
memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
|
||||
memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
|
||||
hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
|
||||
}
|
||||
hwif->chipset = d->chipset ? d->chipset : ide_pci;
|
||||
|
Reference in New Issue
Block a user