[ide] obsolete some command line parameters

"hdx=autotune", "hdx=noautotune":
* should be handled by host drivers needing them

"idex=autotune", "idex=noautotune":
* should die

"idex=ata66":
* should be handled by host drivers needing it

"idex=dma":
* works only for: cs5220.c, generic.c, hpt366.c, triflex.c
* DMA should be used by default

"idex=reset", "idex=serialize":
* host drivers should set these settings when needed

"idex=base[,ctl[,irq]]":
* host drivers should auto-detect correct settings
* ordering should be controlled by user-space

"ide0=four":
* should be handled by ide-generic driver
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2dc188d1
...@@ -1882,10 +1882,10 @@ int __init ide_setup (char *s) ...@@ -1882,10 +1882,10 @@ int __init ide_setup (char *s)
goto do_serialize; goto do_serialize;
case -6: /* "autotune" */ case -6: /* "autotune" */
drive->autotune = IDE_TUNE_AUTO; drive->autotune = IDE_TUNE_AUTO;
goto done; goto obsolete_option;
case -7: /* "noautotune" */ case -7: /* "noautotune" */
drive->autotune = IDE_TUNE_NOAUTO; drive->autotune = IDE_TUNE_NOAUTO;
goto done; goto obsolete_option;
case -9: /* "swapdata" */ case -9: /* "swapdata" */
case -10: /* "bswap" */ case -10: /* "bswap" */
drive->bswap = 1; drive->bswap = 1;
...@@ -2017,30 +2017,30 @@ int __init ide_setup (char *s) ...@@ -2017,30 +2017,30 @@ int __init ide_setup (char *s)
case -7: /* ata66 */ case -7: /* ata66 */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
hwif->udma_four = 1; hwif->udma_four = 1;
goto done; goto obsolete_option;
#else #else
goto bad_hwif; goto bad_hwif;
#endif #endif
case -6: /* dma */ case -6: /* dma */
hwif->autodma = 1; hwif->autodma = 1;
goto done; goto obsolete_option;
case -5: /* "reset" */ case -5: /* "reset" */
hwif->reset = 1; hwif->reset = 1;
goto done; goto obsolete_option;
case -4: /* "noautotune" */ case -4: /* "noautotune" */
hwif->drives[0].autotune = IDE_TUNE_NOAUTO; hwif->drives[0].autotune = IDE_TUNE_NOAUTO;
hwif->drives[1].autotune = IDE_TUNE_NOAUTO; hwif->drives[1].autotune = IDE_TUNE_NOAUTO;
goto done; goto obsolete_option;
case -3: /* "autotune" */ case -3: /* "autotune" */
hwif->drives[0].autotune = IDE_TUNE_AUTO; hwif->drives[0].autotune = IDE_TUNE_AUTO;
hwif->drives[1].autotune = IDE_TUNE_AUTO; hwif->drives[1].autotune = IDE_TUNE_AUTO;
goto done; goto obsolete_option;
case -2: /* "serialize" */ case -2: /* "serialize" */
do_serialize: do_serialize:
hwif->mate = &ide_hwifs[hw^1]; hwif->mate = &ide_hwifs[hw^1];
hwif->mate->mate = hwif; hwif->mate->mate = hwif;
hwif->serialized = hwif->mate->serialized = 1; hwif->serialized = hwif->mate->serialized = 1;
goto done; goto obsolete_option;
case -1: /* "noprobe" */ case -1: /* "noprobe" */
hwif->noprobe = 1; hwif->noprobe = 1;
...@@ -2057,7 +2057,7 @@ int __init ide_setup (char *s) ...@@ -2057,7 +2057,7 @@ int __init ide_setup (char *s)
hwif->irq = vals[2]; hwif->irq = vals[2];
hwif->noprobe = 0; hwif->noprobe = 0;
hwif->chipset = ide_forced; hwif->chipset = ide_forced;
goto done; goto obsolete_option;
case 0: goto bad_option; case 0: goto bad_option;
default: default:
...@@ -2068,6 +2068,9 @@ int __init ide_setup (char *s) ...@@ -2068,6 +2068,9 @@ int __init ide_setup (char *s)
bad_option: bad_option:
printk(" -- BAD OPTION\n"); printk(" -- BAD OPTION\n");
return 1; return 1;
obsolete_option:
printk(" -- OBSOLETE OPTION, WILL BE REMOVED SOON!\n");
return 1;
bad_hwif: bad_hwif:
printk("-- NOT SUPPORTED ON ide%d", hw); printk("-- NOT SUPPORTED ON ide%d", hw);
done: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment