aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/setup-pci.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:35 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:35 -0400
commitf01674e459923c6df540e6c983d37e5fc94d43b8 (patch)
tree3a92f84ee42a62f6c1b070adcfcf74cd5be0b7a7 /drivers/ide/setup-pci.c
parentaab8ad9ec81255ee08825bed36b57484052b94ea (diff)
ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
* Remove obsoleted "idex=noprobe" kernel parameter. * Remove no longer needed hwif->noprobe quirk from ide_hwif_configure() and hwif->noprobe checking from cmd640.c. v2: * "ide?=noprobe" -> "ide?=ata66" in Documentation/kernel-parameters.txt. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/setup-pci.c')
-rw-r--r--drivers/ide/setup-pci.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index ee4a34b49062..f7ede0e42881 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -345,7 +345,6 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
345 unsigned long ctl = 0, base = 0; 345 unsigned long ctl = 0, base = 0;
346 ide_hwif_t *hwif; 346 ide_hwif_t *hwif;
347 u8 bootable = (d->host_flags & IDE_HFLAG_BOOTABLE) ? 1 : 0; 347 u8 bootable = (d->host_flags & IDE_HFLAG_BOOTABLE) ? 1 : 0;
348 u8 oldnoprobe = 0;
349 struct hw_regs_s hw; 348 struct hw_regs_s hw;
350 349
351 if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) { 350 if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
@@ -376,14 +375,8 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
376 hw.chipset = d->chipset ? d->chipset : ide_pci; 375 hw.chipset = d->chipset ? d->chipset : ide_pci;
377 ide_std_init_ports(&hw, base, ctl | 2); 376 ide_std_init_ports(&hw, base, ctl | 2);
378 377
379 if (hwif->io_ports[IDE_DATA_OFFSET] == base &&
380 hwif->io_ports[IDE_CONTROL_OFFSET] == (ctl | 2))
381 oldnoprobe = hwif->noprobe;
382
383 ide_init_port_hw(hwif, &hw); 378 ide_init_port_hw(hwif, &hw);
384 379
385 hwif->noprobe = oldnoprobe;
386
387 hwif->dev = &dev->dev; 380 hwif->dev = &dev->dev;
388 hwif->cds = d; 381 hwif->cds = d;
389 382