2003-09-22 19:40:18

by Christoph Hellwig

Subject: [PATCH] kill CONFIG_EISA_ALWAYS

I'd like to kill willy's CONFIG_EISA_ALWAYS kludge. So make
EISA_bus a variable always when CONFIG_EISA is set and initialize
it to 1 for alpha. We probably want to do that only if the system
actually supports eisa, but I keep the old behaviour for now.

Also remove the CONFIG_EISA helptext on alpha as it's not user-visible.



--- 1.28/arch/alpha/Kconfig Tue Sep 9 23:16:03 2003
+++ edited/arch/alpha/Kconfig Sun Sep 21 21:28:48 2003
@@ -471,21 +471,6 @@
bool
depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
default y
- ---help---
- The Extended Industry Standard Architecture (EISA) bus was
- developed as an open alternative to the IBM MicroChannel bus.
-
- The EISA bus provided some of the features of the IBM MicroChannel
- bus while maintaining backward compatibility with cards made for
- the older ISA bus. The EISA bus saw limited use between 1988 and
- 1995 when it was made obsolete by the PCI bus.
-
- Say Y here if you are building a kernel for an EISA-based machine.
-
- Otherwise, say N.
-
-config EISA_ALWAYS
- def_bool EISA

config SMP
bool "Symmetric multi-processing support"
===== arch/alpha/kernel/setup.c 1.36 vs edited =====
--- 1.36/arch/alpha/kernel/setup.c Sun Aug 17 10:06:24 2003
+++ edited/arch/alpha/kernel/setup.c Mon Sep 22 11:12:13 2003
@@ -33,6 +33,7 @@
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/initrd.h>
+#include <linux/eisa.h>
#ifdef CONFIG_MAGIC_SYSRQ
#include <linux/sysrq.h>
#include <linux/reboot.h>
@@ -679,6 +680,11 @@

/* Default root filesystem to sda2. */
ROOT_DEV = Root_SDA2;
+
+#ifdef CONFIG_EISA
+ /* FIXME: only set this when we actually have EISA in this box? */
+ EISA_bus = 1;
+#endif

/*
* Check ASN in HWRPB for validity, report if bad.
--- 1.12/drivers/eisa/eisa-bus.c Tue Sep 9 23:38:12 2003
+++ edited/drivers/eisa/eisa-bus.c Sun Sep 21 21:27:26 2003
@@ -427,11 +427,8 @@

postcore_initcall (eisa_init);

-#ifndef CONFIG_EISA_ALWAYS
-int EISA_bus;
-EXPORT_SYMBOL(EISA_bus);
-#endif
-
+int EISA_bus; /* for legacy drivers */
+EXPORT_SYMBOL (EISA_bus);
EXPORT_SYMBOL (eisa_bus_type);
EXPORT_SYMBOL (eisa_driver_register);
EXPORT_SYMBOL (eisa_driver_unregister);
--- 1.7/include/linux/eisa.h Tue Sep 9 23:23:44 2003
+++ edited/include/linux/eisa.h Sun Sep 21 21:28:05 2003
@@ -4,16 +4,6 @@
#include <linux/ioport.h>
#include <linux/device.h>

-#ifdef CONFIG_EISA
-# ifdef CONFIG_EISA_ALWAYS
-# define EISA_bus 1
-# else
- extern int EISA_bus;
-# endif
-#else
-# define EISA_bus 0
-#endif
-
#define EISA_SIG_LEN 8
#define EISA_MAX_SLOTS 8

@@ -107,5 +97,11 @@
};

int eisa_root_register (struct eisa_root_device *root);
+
+#ifdef CONFIG_EISA
+extern int EISA_bus;
+#else
+# define EISA_bus 0
+#endif

#endif

2003-09-23 06:33:49

by Marc Zyngier

Subject: Re: [PATCH] kill CONFIG_EISA_ALWAYS

>>>>> "HCH" == Christoph Hellwig <[email protected]> writes:

HCH> I'd like to kill willy's CONFIG_EISA_ALWAYS kludge. So make
HCH> EISA_bus a variable always when CONFIG_EISA is set and initialize
HCH> it to 1 for alpha. We probably want to do that only if the system
HCH> actually supports eisa, but I keep the old behaviour for now.

HCH> Also remove the CONFIG_EISA helptext on alpha as it's not user-visible.

I do not mind the change, but you might want to check that with
Richard Henderson. Maybe there was a good reason for EISA_bus to be
#defined on Alpha (although I really can't see it at the moment...).

Having a single way to define EISA_bus will help its removal in the
future...

M.
--
Places change, faces change. Life is so very strange.