Skip to content

Commit

Permalink
IDE: remove ide=reverse IDE core
Browse files Browse the repository at this point in the history
This option is obsolete and can be removed safely.

It allows us to remove the pci_get_device_reverse() function from the
PCI core.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
  • Loading branch information
gregkh authored and bzolnier committed Apr 17, 2008
1 parent 4b119e2 commit a594eeb
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 31 deletions.
2 changes: 0 additions & 2 deletions Documentation/ide/ide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,6 @@ Summary of ide driver parameters for kernel command line
ability to bit test for detection is currently
unknown.

"ide=reverse" : formerly called to pci sub-system, but now local.

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

There may be more options than shown -- use the source, Luke!
Expand Down
2 changes: 1 addition & 1 deletion Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ and is between 256 and 4096 characters. It is defined in the file
Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]

ide= [HW] (E)IDE subsystem
Format: ide=nodma or ide=doubler or ide=reverse
Format: ide=nodma or ide=doubler
See Documentation/ide/ide.txt.

ide?= [HW] (E)IDE subsystem
Expand Down
9 changes: 1 addition & 8 deletions drivers/ide/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,6 @@ config BLK_DEV_OFFBOARD
This can improve the usability of some boot managers such as lilo
when booting from a drive on an off-board controller.

If you say Y here, and you actually want to reverse the device scan
order as explained above, you also need to issue the kernel command
line option "ide=reverse". (Try "man bootparam" or see the
documentation of your boot loader (lilo or loadlin) about how to
pass options to the kernel at boot time.)

Note that, if you do this, the order of the hd* devices will be
rearranged which may require modification of fstab and other files.

Expand Down Expand Up @@ -615,8 +609,7 @@ config BLK_DEV_HPT366
reference to device 0x80. The other solution is to say Y to "Boot
off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless
your mother board has the chipset natively mounted. Regardless one
should use the fore mentioned option and call at LILO or include
"ide=reverse" in LILO's append-line.
should use the fore mentioned option and call at LILO.

This driver requires dynamic tuning of the chipset during the
ide-probe at boot. It is reported to support DVD II drives, by the
Expand Down
9 changes: 2 additions & 7 deletions drivers/ide/ide-scan-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,8 @@ static int __init ide_scan_pcibus(void)
struct list_head *l, *n;

pre_init = 0;
if (!ide_scan_direction)
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
ide_scan_pcidev(dev);
else
while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID,
dev)))
ide_scan_pcidev(dev);
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
ide_scan_pcidev(dev);

/*
* Hand the drivers over to the PCI layer now we
Expand Down
12 changes: 0 additions & 12 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ static int system_bus_speed; /* holds what we think is VESA/PCI bus speed */
DEFINE_MUTEX(ide_cfg_mtx);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);

#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
#endif

int noautodma = 0;

#ifdef CONFIG_BLK_DEV_IDEACPI
Expand Down Expand Up @@ -1217,14 +1213,6 @@ static int __init ide_setup(char *s)
goto obsolete_option;
}

#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
if (!strcmp(s, "ide=reverse")) {
ide_scan_direction = 1;
printk(" : Enabled support for IDE inverse scan order.\n");
goto obsolete_option;
}
#endif

#ifdef CONFIG_BLK_DEV_IDEACPI
if (!strcmp(s, "ide=noacpi")) {
//printk(" : Disable IDE ACPI support.\n");
Expand Down
1 change: 0 additions & 1 deletion include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,6 @@ extern void do_ide_request(struct request_queue *);
void ide_init_disk(struct gendisk *, ide_drive_t *);

#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
extern int ide_scan_direction;
extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name);
#define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME)
#else
Expand Down

0 comments on commit a594eeb

Please sign in to comment.