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.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 63ef8aaa7b90..caa4a6a32711 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -390,13 +390,9 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port
                 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;