[PATCH 2/3] x86: delete EISA_VLB_PRIMING Kconfig option and code

[Paul Gortmaker]

There was one instance of a VLB card which would emulate
an EISA ID response ID when primed with a certain I/O
handshake.

Since (a) VLB was largely confined to 486 vintage motherboards
from the early/mid 1990s and (b) there was only one card that
needed this and (c) we are dropping EISA support from x86,
everything relating to this option can be removed w/o impacting
any other architectures that might be unwilling to drop EISA
support just yet.

Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
---
 Documentation/eisa.txt      |  4 ++--
 drivers/eisa/Kconfig        | 10 ----------
 drivers/eisa/eisa-bus.c     | 10 ----------
 drivers/eisa/virtual_root.c |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index a55e491..983fea4 100644
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -172,8 +172,8 @@ virtual_root.force_probe :
 
 Force the probing code to probe EISA slots even when it cannot find an
 EISA compliant mainboard (nothing appears on slot 0). Defaults to 0
-(don't force), and set to 1 (force probing) when either
-CONFIG_ALPHA_JENSEN or CONFIG_EISA_VLB_PRIMING are set.
+(don't force), and set to 1 (force probing) when CONFIG_ALPHA_JENSEN
+is set.
 
 ** Random notes :
 
diff --git a/drivers/eisa/Kconfig b/drivers/eisa/Kconfig
index 2705284..c3df390 100644
--- a/drivers/eisa/Kconfig
+++ b/drivers/eisa/Kconfig
@@ -1,16 +1,6 @@
 #
 # EISA configuration
 #
-config EISA_VLB_PRIMING
-	bool "Vesa Local Bus priming"
-	depends on X86 && EISA
-	default n
-	---help---
-	  Activate this option if your system contains a Vesa Local
-	  Bus (VLB) card that identify itself as an EISA card (such as
-	  the Adaptec AHA-284x).
-
-	  When in doubt, say N.
 
 config EISA_PCI_EISA
 	bool "Generic PCI/EISA bridge"
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 612afea..805c4dc 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -81,16 +81,6 @@ static char __init *decode_eisa_sig(unsigned long addr)
 	int i;
 
 	for (i = 0; i < 4; i++) {
-#ifdef CONFIG_EISA_VLB_PRIMING
-		/*
-		 * This ugly stuff is used to wake up VL-bus cards
-		 * (AHA-284x is the only known example), so we can
-		 * read the EISA id.
-		 *
-		 * Thankfully, this only exists on x86...
-		 */
-		outb(0x80 + i, addr);
-#endif
 		sig[i] = inb(addr + i);
 
 		if (!i && (sig[0] & 0x80))
diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c
index 535e4f9..432797f 100644
--- a/drivers/eisa/virtual_root.c
+++ b/drivers/eisa/virtual_root.c
@@ -14,7 +14,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 
-#if defined(CONFIG_ALPHA_JENSEN) || defined(CONFIG_EISA_VLB_PRIMING)
+#if defined(CONFIG_ALPHA_JENSEN)
 #define EISA_FORCE_PROBE_DEFAULT 1
 #else
 #define EISA_FORCE_PROBE_DEFAULT 0
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/