aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-04-17 18:46:20 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-17 18:46:20 -0400
commita594eeb1a1d320981fccc29584b6f21fcebd765f (patch)
tree55f76c9a9b99c4dd98a5ff6034d7150de7057085 /drivers/ide
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff)
IDE: remove ide=reverse IDE core
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 <gregkh@suse.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/Kconfig9
-rw-r--r--drivers/ide/ide-scan-pci.c9
-rw-r--r--drivers/ide/ide.c12
3 files changed, 3 insertions, 27 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index eed6d8e1b5c7..ac5875783430 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -416,12 +416,6 @@ config BLK_DEV_OFFBOARD
416 This can improve the usability of some boot managers such as lilo 416 This can improve the usability of some boot managers such as lilo
417 when booting from a drive on an off-board controller. 417 when booting from a drive on an off-board controller.
418 418
419 If you say Y here, and you actually want to reverse the device scan
420 order as explained above, you also need to issue the kernel command
421 line option "ide=reverse". (Try "man bootparam" or see the
422 documentation of your boot loader (lilo or loadlin) about how to
423 pass options to the kernel at boot time.)
424
425 Note that, if you do this, the order of the hd* devices will be 419 Note that, if you do this, the order of the hd* devices will be
426 rearranged which may require modification of fstab and other files. 420 rearranged which may require modification of fstab and other files.
427 421
@@ -615,8 +609,7 @@ config BLK_DEV_HPT366
615 reference to device 0x80. The other solution is to say Y to "Boot 609 reference to device 0x80. The other solution is to say Y to "Boot
616 off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless 610 off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless
617 your mother board has the chipset natively mounted. Regardless one 611 your mother board has the chipset natively mounted. Regardless one
618 should use the fore mentioned option and call at LILO or include 612 should use the fore mentioned option and call at LILO.
619 "ide=reverse" in LILO's append-line.
620 613
621 This driver requires dynamic tuning of the chipset during the 614 This driver requires dynamic tuning of the chipset during the
622 ide-probe at boot. It is reported to support DVD II drives, by the 615 ide-probe at boot. It is reported to support DVD II drives, by the
diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c
index 93d2e41be853..98888da1b600 100644
--- a/drivers/ide/ide-scan-pci.c
+++ b/drivers/ide/ide-scan-pci.c
@@ -88,13 +88,8 @@ static int __init ide_scan_pcibus(void)
88 struct list_head *l, *n; 88 struct list_head *l, *n;
89 89
90 pre_init = 0; 90 pre_init = 0;
91 if (!ide_scan_direction) 91 while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
92 while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev))) 92 ide_scan_pcidev(dev);
93 ide_scan_pcidev(dev);
94 else
95 while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID,
96 dev)))
97 ide_scan_pcidev(dev);
98 93
99 /* 94 /*
100 * Hand the drivers over to the PCI layer now we 95 * Hand the drivers over to the PCI layer now we
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index fc69fe2e3ec0..5f545153391a 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -90,10 +90,6 @@ static int system_bus_speed; /* holds what we think is VESA/PCI bus speed */
90DEFINE_MUTEX(ide_cfg_mtx); 90DEFINE_MUTEX(ide_cfg_mtx);
91 __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock); 91 __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
92 92
93#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
94int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
95#endif
96
97int noautodma = 0; 93int noautodma = 0;
98 94
99#ifdef CONFIG_BLK_DEV_IDEACPI 95#ifdef CONFIG_BLK_DEV_IDEACPI
@@ -1217,14 +1213,6 @@ static int __init ide_setup(char *s)
1217 goto obsolete_option; 1213 goto obsolete_option;
1218 } 1214 }
1219 1215
1220#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
1221 if (!strcmp(s, "ide=reverse")) {
1222 ide_scan_direction = 1;
1223 printk(" : Enabled support for IDE inverse scan order.\n");
1224 goto obsolete_option;
1225 }
1226#endif
1227
1228#ifdef CONFIG_BLK_DEV_IDEACPI 1216#ifdef CONFIG_BLK_DEV_IDEACPI
1229 if (!strcmp(s, "ide=noacpi")) { 1217 if (!strcmp(s, "ide=noacpi")) {
1230 //printk(" : Disable IDE ACPI support.\n"); 1218 //printk(" : Disable IDE ACPI support.\n");