Skip to contentSkip to conversation

ide: always use ide_std_init_ports() in setup-pci.c

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Nov 27, 2007 – Nov 28, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 3/6 ide: always use ide_std_init_ports() in setup-pci.c

* ide_init_hwif_ports() call in setup-pci.c::ide_hwif_configure() doesn't depend on the default cotrol register offset, default IRQ or ppc_ide_md.ide_init_hwif implementations so ide_std_init_ports() can always be used.

* Since 'base' is always non-zero and thus hwif->io_ports[IDE_DATA_OFFSET] is also non-zero always clear hwif->noprobe.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/setup-pci.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/ide/setup-pci.c +1 -5
Index: b/drivers/ide/setup-pci.c
===================================================================
@@ -390,13 +390,9 @@ static ide_hwif_t *ide_hwif_configure(st
 		hw_regs_t hw;
 
 		memset(&hw, 0, sizeof(hw));
-#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT
 		ide_std_init_ports(&hw, base, ctl | 2);
-#else
-		ide_init_hwif_ports(&hw, base, ctl | 2, NULL);
-#endif
 		memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
-		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
+		hwif->noprobe = 0;
 	}
 	hwif->chipset = d->chipset ? d->chipset : ide_pci;
 	hwif->pci_dev = dev;
Acked-by on v1 3/6
#1 lore raw
Quoted 9 lines · Bartlomiej Zolnierkiewicz

* ide_init_hwif_ports() call in setup-pci.c::ide_hwif_configure() doesn't depend on the default cotrol register offset, default IRQ or ppc_ide_md.ide_init_hwif implementations so ide_std_init_ports() can always be used.

* Since 'base' is always non-zero and thus hwif->io_ports[IDE_DATA_OFFSET] is also non-zero always clear hwif->noprobe.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>

MBR, Sergei