Skip to contentSkip to conversation

ide: remove obsoleted "idex=" kernel parameters

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Mar 11, 2008

Subsystems (2)
Documentation libata
lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 ide: remove obsoleted "idex=" kernel parameters

* Remove obsoleted "idex=" kernel parameters.

* Make probe_* and cmd640_vlb variables static.

Cc Andrew Morton <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
Andrew, this should fix "IDE tree vs i386 allmodconfig" issue.

 Documentation/ide/ide.txt           |    2 
 Documentation/kernel-parameters.txt |    4 -
 drivers/ide/ide.c                   |  115 ------------------------------------
 drivers/ide/legacy/ali14xx.c        |    2 
 drivers/ide/legacy/dtc2278.c        |    2 
 drivers/ide/legacy/ht6560b.c        |    2 
 drivers/ide/legacy/ide-4drives.c    |    2 
 drivers/ide/legacy/qd65xx.c         |    2 
 drivers/ide/legacy/umc8672.c        |    2 
 drivers/ide/pci/cmd640.c            |    5 -
 10 files changed, 8 insertions(+), 130 deletions(-)
Documentation/ide/ide.txt +0 -2
Index: b/Documentation/ide/ide.txt
===================================================================
@@ -193,8 +193,6 @@ Summary of ide driver parameters for ker
 
  "hdx="  is recognized for all "x" from "a" to "h", such as "hdc".
 
- "idex=" is recognized for all "x" from "0" to "3", 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
Documentation/kernel-parameters.txt +0 -4
Index: b/Documentation/kernel-parameters.txt
===================================================================
@@ -768,10 +768,6 @@ and is between 256 and 4096 characters. 
 			Format: ide=nodma or ide=doubler or ide=reverse
 			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.
drivers/ide/ide.c +1 -114

145 lines not on this page · raw message

drivers/ide/legacy/ali14xx.c +1 -1
Index: b/drivers/ide/legacy/ali14xx.c
===================================================================
@@ -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");
drivers/ide/legacy/dtc2278.c +1 -1
Index: b/drivers/ide/legacy/dtc2278.c
===================================================================
@@ -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");
drivers/ide/legacy/ht6560b.c +1 -1
Index: b/drivers/ide/legacy/ht6560b.c
===================================================================
@@ -323,7 +323,7 @@ static void __init ht6560b_port_init_dev
 	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");
drivers/ide/legacy/ide-4drives.c +1 -1
Index: b/drivers/ide/legacy/ide-4drives.c
===================================================================
@@ -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");
drivers/ide/legacy/qd65xx.c +1 -1
Index: b/drivers/ide/legacy/qd65xx.c
===================================================================
@@ -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");
drivers/ide/legacy/umc8672.c +1 -1
Index: b/drivers/ide/legacy/umc8672.c
===================================================================
@@ -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");
drivers/ide/pci/cmd640.c +1 -4
Index: b/drivers/ide/pci/cmd640.c
===================================================================
@@ -111,10 +111,7 @@
 
 #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.