ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted

Mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted
(nowadays device-driver binding can be changed at runtime through sysfs
 and it can also be dealt with using per device driver parameters).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 2 insertions, 6 deletions

diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt
index d4877a9e60f6..3f4db0018edc 100644
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -242,10 +242,6 @@ Summary of ide driver parameters for kernel command line
 
  "hdx=nodma"            : disallow DMA
 
- "hdx=scsi"             : the return of the ide-scsi flag, this is useful for
-                          allowing ide-floppy, ide-tape, and ide-cdrom|writers
-                          to use ide-scsi emulation on a device specific option.
-
  "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.
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 373bdd4e5ef8..df410e0357d8 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1258,7 +1258,7 @@ static int __init ide_setup(char *s)
                 drive = &hwif->drives[unit];
                 if (strncmp(s + 4, "ide-", 4) == 0) {
                         strlcpy(drive->driver_req, s + 4, sizeof(drive->driver_req));
-                        goto done;
+                        goto obsolete_option;
                 }
                 switch (match_parm(&s[3], hd_words, vals, 3)) {
                         case -1: /* "none" */
@@ -1296,7 +1296,7 @@ static int __init ide_setup(char *s)
                                 goto done;
                         case -14: /* "scsi" */
                                 drive->scsi = 1;
-                                goto done;
+                                goto obsolete_option;
                         case 3: /* cyl,head,sect */
                                 drive->media    = ide_disk;
                                 drive->ready_stat = READY_STAT;