ide: remove obsoleted "idex=" kernel parameters
Bartlomiej Zolnierkiewicz [Sun, 27 Apr 2008 13:38:24 +0000 (15:38 +0200)]
* Remove obsoleted "idex=" kernel parameters.

* Make probe_* and cmd640_vlb variables static.

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Documentation/ide/ide.txt
Documentation/kernel-parameters.txt
drivers/ide/ide.c
drivers/ide/legacy/ali14xx.c
drivers/ide/legacy/dtc2278.c
drivers/ide/legacy/ht6560b.c
drivers/ide/legacy/ide-4drives.c
drivers/ide/legacy/qd65xx.c
drivers/ide/legacy/umc8672.c
drivers/ide/pci/cmd640.c

index 53e5bed..af95fb3 100644 (file)
@@ -186,8 +186,6 @@ Summary of ide driver parameters for kernel command line
 
  "hdx="  is recognized for all "x" from "a" to "u", such as "hdc".
 
- "idex=" is recognized for all "x" from "0" to "9", such as "ide1".
-
  "hdx=noprobe"         : drive may be present, but do not probe for it
 
  "hdx=none"            : drive is NOT present, ignore cmos and do not probe
index bf6303e..e5f3d91 100644 (file)
@@ -772,10 +772,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: ide=nodma or ide=doubler
                        See Documentation/ide/ide.txt.
 
-       ide?=           [HW] (E)IDE subsystem
-                       Format: ide?=ata66 or chipset specific parameters.
-                       See Documentation/ide/ide.txt.
-
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
                        See Documentation/ide/ide.txt.
 
index 7ccf99a..a33840d 100644 (file)
@@ -837,16 +837,6 @@ static int __init match_parm (char *s, const char *keywords[], int vals[], int m
        return 0;       /* zero = nothing matched */
 }
 
-extern int probe_ali14xx;
-extern int probe_umc8672;
-extern int probe_dtc2278;
-extern int probe_ht6560b;
-extern int probe_qd65xx;
-extern int cmd640_vlb;
-extern int probe_4drives;
-
-static int __initdata is_chipset_set;
-
 /*
  * ide_setup() gets called VERY EARLY during initialization,
  * to handle kernel "command line" strings beginning with "hdx=" or "ide".
@@ -855,14 +845,12 @@ static int __initdata is_chipset_set;
  */
 static int __init ide_setup(char *s)
 {
-       int i, vals[3];
        ide_hwif_t *hwif;
        ide_drive_t *drive;
        unsigned int hw, unit;
+       int vals[3];
        const char max_drive = 'a' + ((MAX_HWIFS * MAX_DRIVES) - 1);
-       const char max_hwif  = '0' + (MAX_HWIFS - 1);
 
-       
        if (strncmp(s,"hd",2) == 0 && s[2] == '=')      /* hd= is for hd.c   */
                return 0;                               /* driver and not us */
 
@@ -986,114 +974,13 @@ static int __init ide_setup(char *s)
                        printk(" -- BAD BUS SPEED! Expected value from 20 to 66");
                goto done;
        }
-       /*
-        * Look for interface options:  "idex="
-        */
-       if (s[3] >= '0' && s[3] <= max_hwif) {
-               /*
-                * Be VERY CAREFUL changing this: note hardcoded indexes below
-                * (-8, -9, -10) are reserved to ease the hardcoding.
-                */
-               static const char *ide_words[] = {
-                       "minus1", "minus2", "minus3", "minus4",
-                       "minus5", "minus6", "ata66", "minus8", "minus9",
-                       "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
-                       "dtc2278", "umc8672", "ali14xx", NULL };
-
-               hw = s[3] - '0';
-               hwif = &ide_hwifs[hw];
-               i = match_parm(&s[4], ide_words, vals, 3);
-
-               /*
-                * Cryptic check to ensure chipset not already set for hwif.
-                * Note: we can't depend on hwif->chipset here.
-                */
-               if (i >= -18 && i <= -11) {
-                       /* chipset already specified */
-                       if (is_chipset_set)
-                               goto bad_option;
-                       /* these drivers are for "ide0=" only */
-                       if (hw != 0)
-                               goto bad_hwif;
-                       is_chipset_set = 1;
-                       printk("\n");
-               }
 
-               switch (i) {
-#ifdef CONFIG_BLK_DEV_ALI14XX
-                       case -17: /* "ali14xx" */
-                               probe_ali14xx = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_UMC8672
-                       case -16: /* "umc8672" */
-                               probe_umc8672 = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_DTC2278
-                       case -15: /* "dtc2278" */
-                               probe_dtc2278 = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_CMD640
-                       case -14: /* "cmd640_vlb" */
-                               cmd640_vlb = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_HT6560B
-                       case -13: /* "ht6560b" */
-                               probe_ht6560b = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_QD65XX
-                       case -12: /* "qd65xx" */
-                               probe_qd65xx = 1;
-                               goto obsolete_option;
-#endif
-#ifdef CONFIG_BLK_DEV_4DRIVES
-                       case -11: /* "four" drives on one set of ports */
-                               probe_4drives = 1;
-                               goto obsolete_option;
-#endif
-                       case -10: /* minus10 */
-                       case -9: /* minus9 */
-                       case -8: /* minus8 */
-                       case -6:
-                       case -4:
-                       case -3:
-                               goto bad_option;
-                       case -7: /* ata66 */
-#ifdef CONFIG_BLK_DEV_IDEPCI
-                               /*
-                                * Use ATA_CBL_PATA40_SHORT so drive side
-                                * cable detection is also overriden.
-                                */
-                               hwif->cbl = ATA_CBL_PATA40_SHORT;
-                               goto obsolete_option;
-#else
-                               goto bad_hwif;
-#endif
-                       case -5:
-                       case -2:
-                       case -1:
-                       case 0:
-                       case 1:
-                       case 2:
-                       case 3:
-                               goto bad_option;
-                       default:
-                               printk(" -- SUPPORT NOT CONFIGURED IN THIS KERNEL\n");
-                               return 1;
-               }
-       }
 bad_option:
        printk(" -- BAD OPTION\n");
        return 1;
 obsolete_option:
        printk(" -- OBSOLETE OPTION, WILL BE REMOVED SOON!\n");
        return 1;
-bad_hwif:
-       printk("-- NOT SUPPORTED ON ide%d", hw);
 done:
        printk("\n");
        return 1;
index 6efbf94..c689863 100644 (file)
@@ -220,7 +220,7 @@ static int __init ali14xx_probe(void)
        return ide_legacy_device_add(&ali14xx_port_info, 0);
 }
 
-int probe_ali14xx;
+static int probe_ali14xx;
 
 module_param_named(probe, probe_ali14xx, bool, 0);
 MODULE_PARM_DESC(probe, "probe for ALI M14xx chipsets");
index f7c4ad1..581909a 100644 (file)
@@ -131,7 +131,7 @@ static int __init dtc2278_probe(void)
        return ide_legacy_device_add(&dtc2278_port_info, 0);
 }
 
-int probe_dtc2278 = 0;
+static int probe_dtc2278;
 
 module_param_named(probe, probe_dtc2278, bool, 0);
 MODULE_PARM_DESC(probe, "probe for DTC2278xx chipsets");
index 702d8de..8b2a5b4 100644 (file)
@@ -323,7 +323,7 @@ static void __init ht6560b_port_init_devs(ide_hwif_t *hwif)
        hwif->drives[1].drive_data = t;
 }
 
-int probe_ht6560b = 0;
+static int probe_ht6560b;
 
 module_param_named(probe, probe_ht6560b, bool, 0);
 MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
index 17f94d0..ecae916 100644 (file)
@@ -6,7 +6,7 @@
 
 #define DRV_NAME "ide-4drives"
 
-int probe_4drives;
+static int probe_4drives;
 
 module_param_named(probe, probe_4drives, bool, 0);
 MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
index 15a99aa..61d5889 100644 (file)
@@ -399,7 +399,7 @@ static int __init qd_probe(int base)
        return rc;
 }
 
-int probe_qd65xx = 0;
+static int probe_qd65xx;
 
 module_param_named(probe, probe_qd65xx, bool, 0);
 MODULE_PARM_DESC(probe, "probe for QD65xx chipsets");
index 17d5153..6f25f0f 100644 (file)
@@ -158,7 +158,7 @@ static int __init umc8672_probe(void)
        return ide_legacy_device_add(&umc8672_port_info, 0);
 }
 
-int probe_umc8672;
+static int probe_umc8672;
 
 module_param_named(probe, probe_umc8672, bool, 0);
 MODULE_PARM_DESC(probe, "probe for UMC8672 chipset");
index 25c2f1b..0f6f11e 100644 (file)
 
 #define DRV_NAME "cmd640"
 
-/*
- * This flag is set in ide.c by the parameter:  ide0=cmd640_vlb
- */
-int cmd640_vlb;
+static int cmd640_vlb;
 
 /*
  * CMD640 specific registers definition.