Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931ee0dc authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent dbac9f89

drivers/ide/ide-acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static int ide_tune_dma(ide_drive_t *drive) 
	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
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ static const u8 ide_hwif_to_major[] = { IDE0_MAJOR, IDE1_MAJOR, 
					IDE8_MAJOR, IDE9_MAJOR };



DEFINE_MUTEX(ide_cfg_mtx);

 __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);



int noautodma = 0;

__cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);

EXPORT_SYMBOL(ide_lock);



ide_hwif_t ide_hwifs[MAX_HWIFS];	/* master data repository */
@@ -698,59 +698,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 


EXPORT_SYMBOL(generic_ide_ioctl);



/*

 * ide_setup() gets called VERY EARLY during initialization,

 * to handle kernel "command line" strings beginning with "ide".

 *

 * Remember to update Documentation/ide/ide.txt if you change something here.

 */

static int __init ide_setup(char *s)

{

	printk(KERN_INFO "ide_setup: %s", s);



#ifdef CONFIG_BLK_DEV_IDEDOUBLER

	if (!strcmp(s, "ide=doubler")) {

		extern int ide_doubler;



		printk(" : Enabled support for IDE doublers\n");

		ide_doubler = 1;

		goto obsolete_option;

	}

#endif /* CONFIG_BLK_DEV_IDEDOUBLER */



	if (!strcmp(s, "ide=nodma")) {

		printk(" : Prevented DMA\n");

		noautodma = 1;

		goto obsolete_option;

	}



#ifdef CONFIG_BLK_DEV_IDEACPI

	if (!strcmp(s, "ide=noacpi")) {

		//printk(" : Disable IDE ACPI support.\n");

		ide_noacpi = 1;

		goto obsolete_option;

	}

	if (!strcmp(s, "ide=acpigtf")) {

		//printk(" : Enable IDE ACPI _GTF support.\n");

		ide_acpigtf = 1;

		goto obsolete_option;

	}

	if (!strcmp(s, "ide=acpionboot")) {

		//printk(" : Call IDE ACPI methods on boot.\n");

		ide_acpionboot = 1;

		goto obsolete_option;

	}

#endif /* CONFIG_BLK_DEV_IDEACPI */



	printk(" -- BAD OPTION\n");

	return 1;

obsolete_option:

	printk(" -- OBSOLETE OPTION, WILL BE REMOVED SOON!\n");

	return 1;

}



EXPORT_SYMBOL(ide_lock);



static int ide_bus_match(struct device *dev, struct device_driver *drv)

{

	return 1;
@@ -1087,32 +1034,7 @@ static int __init ide_init(void) 
	return ret;

}



#ifdef MODULE

static char *options = NULL;

module_param(options, charp, 0);

MODULE_LICENSE("GPL");



static void __init parse_options (char *line)

{

	char *next = line;



	if (line == NULL || !*line)

		return;

	while ((line = next) != NULL) {

 		if ((next = strchr(line,' ')) != NULL)

			*next++ = 0;

		if (!ide_setup(line))

			printk (KERN_INFO "Unknown option '%s'\n", line);

	}

}



int __init init_module (void)

{

	parse_options(options);

	return ide_init();

}



void __exit cleanup_module (void)

static void __exit ide_exit(void)

{

	proc_ide_destroy();
@@ -1121,10 +1043,7 @@ void __exit cleanup_module (void) 
	bus_unregister(&ide_bus_type);

}



#else /* !MODULE */



__setup("", ide_setup);



module_init(ide_init);

module_exit(ide_exit);



#endif /* MODULE */
 
MODULE_LICENSE("GPL");

drivers/ide/legacy/gayle.c

+1 −3
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ 
#define GAYLE_HAS_CONTROL_REG	(!ide_doubler)

#define GAYLE_IDEREG_SIZE	(ide_doubler ? 0x1000 : 0x2000)



int ide_doubler = 0;	/* support IDE doublers? */

EXPORT_SYMBOL_GPL(ide_doubler);



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
Original line number Diff line number Diff line
@@ -813,10 +813,6 @@ int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *, unsig 
#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;