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>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 228d85a3f3192999c233e5213c65400f8dc1699c..239e78a1fcd03e394117ec7630ff16140e4f4174 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -767,7 +767,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        See Documentation/ide/ide.txt.
 
        ide?=           [HW] (E)IDE subsystem
-                       Format: ide?=noprobe or chipset specific parameters.
+                       Format: ide?=ata66 or chipset specific parameters.
                        See Documentation/ide/ide.txt.
 
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 690b5ff4d88ff9491f26b989292391545015375a..aa809aded87f62a2edd49808bddfd12b902cdc1f 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1131,7 +1131,7 @@ static int __init ide_setup(char *s)
                 * (-8, -9, -10) are reserved to ease the hardcoding.
                 */
                static const char *ide_words[] = {
-                       "noprobe", "serialize", "minus3", "minus4",
+                       "minus1", "serialize", "minus3", "minus4",
                        "reset", "minus6", "ata66", "minus8", "minus9",
                        "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
                        "dtc2278", "umc8672", "ali14xx", NULL };
@@ -1218,9 +1218,7 @@ static int __init ide_setup(char *s)
                                hwif->serialized = hwif->mate->serialized = 1;
                                goto obsolete_option;
 
-                       case -1: /* "noprobe" */
-                               hwif->noprobe = 1;
-                               goto obsolete_option;
+                       case -1:
                        case 0:
                        case 1:
                        case 2:

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index dbf0fa733b765caf9583bb3250bf8926521244e7..a1cfe033a55f5ac5b42150c32118123ea7320229 100644 (file)
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -789,8 +789,7 @@ static int __init cmd640x_init(void)
        /*
         * Try to enable the secondary interface, if not already enabled
         */
-       if (cmd_hwif1->noprobe ||
-           (cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe)) {
+       if (cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe) {
                port2 = "not probed";
        } else {
                b = get_cmd640_reg(CNTRL);

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index ee4a34b49062642750f23ced1358a682d685c80e..f7ede0e42881f5ae56d63780fdbd8d635548a355 100644 (file)
--- 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,
        unsigned long ctl = 0, base = 0;
        ide_hwif_t *hwif;
        u8 bootable = (d->host_flags & IDE_HFLAG_BOOTABLE) ? 1 : 0;
-       u8 oldnoprobe = 0;
        struct hw_regs_s hw;
 
        if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
@@ -376,14 +375,8 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
        hw.chipset = d->chipset ? d->chipset : ide_pci;
        ide_std_init_ports(&hw, base, ctl | 2);
 
-       if (hwif->io_ports[IDE_DATA_OFFSET] == base &&
-           hwif->io_ports[IDE_CONTROL_OFFSET] == (ctl | 2))
-               oldnoprobe = hwif->noprobe;
-
        ide_init_port_hw(hwif, &hw);
 
-       hwif->noprobe = oldnoprobe;
-
        hwif->dev = &dev->dev;
        hwif->cds = d;