Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6828fc9a919b06723599192300053ddf6f638c95
Commit: 6828fc9a919b06723599192300053ddf6f638c95
Parent: aa79a2faa01ded0a6a4929dd37c059bef4890838
Author: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 20:13:08 2008 +0100
Committer: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 20:13:08 2008 +0100
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 <[EMAIL PROTECTED]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
drivers/ide/setup-pci.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 63ef8aa..caa4a6a 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
