ide: remove CONFIG_BLK_DEV_HD_IDE config option (take 2) (80aa31cb) · Commits · 戴 / test

Documentation/ide/ide.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -184,13 +184,6 @@ provided it is mounted with the default block size of 1024 (as above).
		Please pass on any feedback on any of this stuff to the maintainer,
		whose address can be found in linux/MAINTAINERS.

		Note that if BOTH hd.c and ide.c are configured into the kernel,
		hd.c will normally be allowed to control the primary IDE interface.
		This is useful for older hardware that may be incompatible with ide.c,
		and still allows newer hardware to run on the 2nd/3rd/4th IDE ports
		under control of ide.c. To have ide.c also "take over" the primary
		IDE port in this situation, use the "command line" parameter: ide0=0x1f0

		The IDE driver is modularized. The high level disk/CD-ROM/tape/floppy
		drivers can always be compiled as loadable modules, the chipset drivers
		can only be compiled into the kernel, and the core code (ide.c) can be

drivers/ide/Kconfig

+5 −20

Original line number	Diff line number	Diff line
		@@ -122,24 +122,6 @@ config BLK_DEV_IDE_SATA

		If unsure, say N.

		config BLK_DEV_HD_IDE
		bool "Use old disk-only driver on primary interface"
		depends on (X86 \|\| SH_MPC1211)
		---help---
		There are two drivers for MFM/RLL/IDE disks. Most people use just
		the new enhanced driver by itself. This option however installs the
		old hard disk driver to control the primary IDE/disk interface in
		the system, leaving the new enhanced IDE driver to take care of only
		the 2nd/3rd/4th IDE interfaces. Doing this will prevent you from
		having an IDE/ATAPI CD-ROM or tape drive connected to the primary
		IDE interface. Choosing this option may be useful for older systems
		which have MFM/RLL/ESDI controller+drives at the primary port
		address (0x1f0), along with IDE drives at the secondary/3rd/4th port
		addresses.

		Normally, just say N here; you will then use the new driver for all
		4 interfaces.

		config BLK_DEV_IDEDISK
		tristate "Include IDE/ATA-2 DISK support"
		---help---
		@@ -1114,7 +1096,6 @@ endif

		config BLK_DEV_HD_ONLY
		bool "Old hard disk (MFM/RLL/IDE) driver"
		depends on BLK_DEV_IDE=n
		help
		There are two drivers for MFM/RLL/IDE hard disks. Most people use
		the newer enhanced driver, but this old one is still around for two
		@@ -1126,12 +1107,16 @@ config BLK_DEV_HD_ONLY
		for systems with only older MFM/RLL/ESDI drives. Choosing the old
		driver can save 13 KB or so of kernel memory.

		If you want to use this driver together with the new one you have
		to use "hda=noprobe hdb=noprobe" kernel parameters to prevent the new
		driver from probing the primary interface.

		If you are unsure, then just choose the Enhanced IDE/MFM/RLL driver
		instead of this one. For more detailed information, read the
		Disk-HOWTO, available from
		<http://www.tldp.org/docs.html#howto>.

		config BLK_DEV_HD
		def_bool BLK_DEV_HD_IDE \|\| BLK_DEV_HD_ONLY
		def_bool BLK_DEV_HD_ONLY

		endif # IDE

drivers/ide/ide.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -177,10 +177,6 @@ static void init_hwif_default(ide_hwif_t *hwif, unsigned int index)
		memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));

		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
		#ifdef CONFIG_BLK_DEV_HD
		if (hwif->io_ports[IDE_DATA_OFFSET] == HD_DATA)
		hwif->noprobe = 1; /* may be overridden by ide_setup() */
		#endif
		}

		/*

Admin message