ide: add "hdx=nodma" kernel parameter

* Add "hdx=nodma" option allowing user to disallow DMA for a given device.

* Obsolete "ide=nodma" option.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 27c4fe250701..5b090662683e 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1272,7 +1272,7 @@ static int __init ide_setup(char *s)
         if (!strcmp(s, "ide=nodma")) {
                 printk(" : Prevented DMA\n");
                 noautodma = 1;
-                return 1;
+                goto obsolete_option;
         }
 
 #ifdef CONFIG_IDEPCI_PCIBUS_ORDER
@@ -1306,7 +1306,7 @@ static int __init ide_setup(char *s)
          */
         if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) {
                 const char *hd_words[] = {
-                        "none", "noprobe", "nowerr", "cdrom", "minus5",
+                        "none", "noprobe", "nowerr", "cdrom", "nodma",
                         "autotune", "noautotune", "minus8", "swapdata", "bswap",
                         "noflush", "remap", "remap63", "scsi", NULL };
                 unit = s[2] - 'a';
@@ -1334,6 +1334,9 @@ static int __init ide_setup(char *s)
                                 drive->ready_stat = 0;
                                 hwif->noprobe = 0;
                                 goto done;
+                        case -5: /* nodma */
+                                drive->nodma = 1;
+                                goto done;
                         case -6: /* "autotune" */
                                 drive->autotune = IDE_TUNE_AUTO;
                                 goto obsolete_option;