mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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>
This commit is contained in:
parent
aa79a2faa0
commit
6828fc9a91
1 changed files with 1 additions and 5 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue