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

Commit e460a597 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove obsoleted "idex=reset" kernel parameter 



Remove obsoleted "idex=reset" kernel parameter
(it has been obsoleted since 1 Nov 2004).

Then remove corresponding code from ide_probe_port()
and no longer used ->reset field from ide_hwif_t.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 9dd4cf1f

Documentation/ide/ide.txt

+0 −2
Original line number Diff line number Diff line
@@ -217,8 +217,6 @@ Summary of ide driver parameters for kernel command line 
			  As for VLB, it is safest to not specify it.

			  Bigger values are safer than smaller ones.



 "idex=reset"		: reset interface after probe



 "ide=doubler"		: probe/support IDE doublers on Amiga



There may be more options than shown -- use the source, Luke!

drivers/ide/ide-probe.c

+2 −7
Original line number Diff line number Diff line
@@ -800,14 +800,9 @@ static int ide_probe_port(ide_hwif_t *hwif) 
		if (drive->present)

			rc = 0;

	}

	if (hwif->io_ports[IDE_CONTROL_OFFSET] && hwif->reset) {

		printk(KERN_WARNING "%s: reset\n", hwif->name);

		hwif->OUTB(12, hwif->io_ports[IDE_CONTROL_OFFSET]);

		udelay(10);

		hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);

		(void)ide_busy_sleep(hwif);

	}



	local_irq_restore(flags);



	/*

	 * Use cached IRQ number. It might be (and is...) changed by probe

	 * code above

drivers/ide/ide.c

+2 −4
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int __init ide_setup(char *s) 
		 */

		static const char *ide_words[] = {

			"minus1", "minus2", "minus3", "minus4",

			"reset", "minus6", "ata66", "minus8", "minus9",

			"minus5", "minus6", "ata66", "minus8", "minus9",

			"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",

			"dtc2278", "umc8672", "ali14xx", NULL };
@@ -1073,9 +1073,7 @@ static int __init ide_setup(char *s) 
#else

				goto bad_hwif;

#endif

			case -5: /* "reset" */

				hwif->reset = 1;

				goto obsolete_option;

			case -5:

			case -2:

			case -1:

			case 0:

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ typedef struct hwif_s { 
	unsigned	present    : 1;	/* this interface exists */

	unsigned	serialized : 1;	/* serialized all channel operation */

	unsigned	sharing_irq: 1;	/* 1 = sharing irq with another hwif */

	unsigned	reset      : 1;	/* reset after probe */

	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */

	unsigned	mmio       : 1; /* host uses MMIO */