ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted

Mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted
(they are layering violation and should be dealt with in the same
 way as done by libata - device-mapper should be used instead).

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

diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt
index 3f4db0018edcdb3de26f9a80134bc89ca1397732..818676aad45a7f8cdb3e578530117033c8703ef1 100644 (file)
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -228,11 +228,6 @@ Summary of ide driver parameters for kernel command line
 
  "hdx=cyl,head,sect"   : disk drive is present, with specified geometry
 
- "hdx=remap"           : remap access of sector 0 to sector 1 (for EZDrive)
-
- "hdx=remap63"         : remap the drive: add 63 to all sector numbers
-                         (for DM OnTrack)
-
  "hdx=autotune"                : driver will attempt to tune interface speed
                          to the fastest PIO mode supported,
                          if possible for this drive only.

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index df410e0357d8d7833ea145c1772dbb7017c76cd8..fc69fe2e3ec0ede1c5beb62e4ed05adfb85d94a7 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1290,10 +1290,10 @@ static int __init ide_setup(char *s)
                                goto done;
                        case -12: /* "remap" */
                                drive->remap_0_to_1 = 1;
-                               goto done;
+                               goto obsolete_option;
                        case -13: /* "remap63" */
                                drive->sect0 = 63;
-                               goto done;
+                               goto obsolete_option;
                        case -14: /* "scsi" */
                                drive->scsi = 1;
                                goto obsolete_option;