ide: remove obsoleted "ide=" kernel parameters

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Mar 23, 2008 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2008-03-23 20:16 UTC #0 lore raw

PATCH 3/3 ide: remove obsoleted "ide=" kernel parameters

* Remove obsoleted "ide=" kernel parameters.

* Remove no longer needed:
- ide_setup()
- parse_options()
- __setup("", ...)
- module_param(options, ...)

* Use module_{init,exit}() for MODULE=y case and remove MODULE ifdef.

* Make ide_*acpi* and ide_doubler variables static.

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

---
 drivers/ide/ide-acpi.c     |    6 +-
 drivers/ide/ide-dma.c      |    2 
 drivers/ide/ide.c          |   91 ++-------------------------------------------
 drivers/ide/legacy/gayle.c |    3 -
 include/linux/ide.h        |    4 -
 5 files changed, 11 insertions(+), 95 deletions(-)

drivers/ide/ide-acpi.c +3 -3

Index: b/drivers/ide/ide-acpi.c
===================================================================
@@ -60,15 +60,15 @@ struct ide_acpi_hwif_link {
 #define DEBPRINT(fmt, args...)	do {} while (0)
 #endif	/* DEBUGGING */
 
-int ide_noacpi;
+static int ide_noacpi;
 module_param_named(noacpi, ide_noacpi, bool, 0);
 MODULE_PARM_DESC(noacpi, "disable IDE ACPI support");
 
-int ide_acpigtf;
+static int ide_acpigtf;
 module_param_named(acpigtf, ide_acpigtf, bool, 0);
 MODULE_PARM_DESC(acpigtf, "enable IDE ACPI _GTF support");
 
-int ide_acpionboot;
+static int ide_acpionboot;
 module_param_named(acpionboot, ide_acpionboot, bool, 0);
 MODULE_PARM_DESC(acpionboot, "call IDE ACPI methods on boot");

drivers/ide/ide-dma.c +1 -1

Index: b/drivers/ide/ide-dma.c
===================================================================
@@ -691,7 +691,7 @@ static int ide_tune_dma(ide_drive_t *dri
 	ide_hwif_t *hwif = drive->hwif;
 	u8 speed;
 
-	if (noautodma || drive->nodma || (drive->id->capability & 1) == 0)
+	if (drive->nodma || (drive->id->capability & 1) == 0)
 		return 0;
 
 	/* consult the list of known "bad" drives */

drivers/ide/ide.c +5 ~~-86~~

115 lines not on this page · raw message

drivers/ide/legacy/gayle.c +2 -1

Index: b/drivers/ide/legacy/gayle.c
===================================================================
@@ -62,7 +62,8 @@
 					       GAYLE_NUM_HWIFS-1)
 #define GAYLE_HAS_CONTROL_REG	(!ide_doubler)
 #define GAYLE_IDEREG_SIZE	(ide_doubler ? 0x1000 : 0x2000)
-int ide_doubler = 0;	/* support IDE doublers? */
+
+static int ide_doubler;
 module_param_named(doubler, ide_doubler, bool, 0);
 MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */

include/linux/ide.h +0 -4

Index: b/include/linux/ide.h
===================================================================
@@ -799,10 +799,6 @@ int generic_ide_ioctl(ide_drive_t *, str
 #ifndef _IDE_C
 extern	ide_hwif_t	ide_hwifs[];		/* master data repository */
 #endif
-extern int ide_noacpi;
-extern int ide_acpigtf;
-extern int ide_acpionboot;
-extern int noautodma;
 
 extern int ide_vlb_clk;
 extern int ide_pci_clk;