ide: mark "idebus=" kernel parameter as obsoleted (take 2)

We have "vlb|pci_clock=" parameters now.

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

diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt
index af95fb33d1a10440df46b015b7ed6d43f353c504..eb4d3b7a6214f94a6c1183e1574e093e6e391ed5 100644 (file)
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -205,16 +205,6 @@ Summary of ide driver parameters for kernel command line
 
  "hdx=nodma"           : disallow DMA
 
- "idebus=xx"           : inform IDE driver of VESA/PCI bus speed in MHz,
-                         where "xx" is between 20 and 66 inclusive,
-                         used when tuning chipset PIO modes.
-                         For PCI bus, 25 is correct for a P75 system,
-                         30 is correct for P90,P120,P180 systems,
-                         and 33 is used for P100,P133,P166 systems.
-                         If in doubt, use idebus=33 for PCI.
-                         As for VLB, it is safest to not specify it.
-                         Bigger values are safer than smaller ones.
-
  "ide=doubler"         : probe/support IDE doublers on Amiga
 
 There may be more options than shown -- use the source, Luke!

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3d1fc5fdc2b2830ce9eef086d312ae1b95358c1b..ad34fe98a23c97cc40d438c119cd344e45b7e6df 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -969,7 +969,7 @@ static int __init ide_setup(char *s)
                        idebus_parameter = vals[0];
                } else
                        printk(" -- BAD BUS SPEED! Expected value from 20 to 66");
-               goto done;
+               goto obsolete_option;
        }
 
 bad_option:

diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 5621963f755f26490a943db0761561126ef469ac..87cef68e8add30d831581f68a9dc895399fc61c7 100644 (file)
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -11,8 +11,6 @@
  *
  * QDI QD6500/QD6580 EIDE controller fast support
  *
- * Please set local bus speed using kernel parameter idebus
- *     for example, "idebus=33" stands for 33Mhz VLbus
  * To activate controller support, use "ide0=qd65xx"
  * To enable tuning, use "hda=autotune hdb=autotune"
  * To enable 2nd channel tuning (qd6580 only), use "hdc=autotune hdd=autotune"

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 8ef551ab957102b1bdc5d98c294953bbeea2420a..77cc22c2ad457b61092e67056d31cab28d3fcbb1 100644 (file)
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -18,8 +18,6 @@
  *   hdparm -t reports 8.17 MB/sec at about 6% CPU usage for the DTTA
  * - this is my first linux driver, so there's probably a lot  of room
  *   for optimizations and bug fixing, so feel free to do it.
- * - use idebus=xx parameter to set PCI bus speed - needed to calc
- *   timings for PIO modes (default will be 40)
  * - if using PIO mode it's a good idea to set the PIO mode and
  *   32-bit I/O support (if possible), e.g. hdparm -p2 -c1 /dev/hda
  * - I had some problems with my IBM DHEA with PIO modes < 2

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index f766be9afaf96f2e18c5d96f8cb8f1caa2952c91..684160d3cc0ebf36e004f1097df02bb00a1ea19a 100644 (file)
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -53,8 +53,7 @@
  * If you then set the second drive to another PIO, the old value
  * (automatically selected) will be overrided by yours.
  * There is a 25/33MHz switch in configuration
- * register, but driver is written for use at any frequency which get
- * (use idebus=xx to select PCI bus speed).
+ * register, but driver is written for use at any frequency.
  *
  * Version 0.1, Nov 8, 1996
  * by Jaromir Koutek, for 2.1.8.