Skip to contentSkip to conversation

small MCA cleanups

PATCH New Adrian Bunk 1 participant 1 message Nov 7, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 small MCA cleanups

The patch below does the following cleanups in the MCA code:
- make some needlessly global code static
- remove three unused global functions from mca-legacy.c (two of them were EXPORT_SYMBOL'ed); this should IMHO be safe since mca-legacy is not an API drivers should move to

diffstat output:

 drivers/mca/mca-bus.c      |    2 -
 drivers/mca/mca-legacy.c   |   59 -------------------------------------
 drivers/mca/mca-proc.c     |    4 +-
 include/linux/mca-legacy.h |    5 ---
 4 files changed, 3 insertions(+), 67 deletions(-)
drivers/mca/mca-bus.c renamed from drivers/mca/mca-bus.c.old +1 -1
@@ -34,7 +34,7 @@
 /* Very few machines have more than one MCA bus.  However, there are
  * those that do (Voyager 35xx/5xxx), so we do it this way for future
  * expansion.  None that I know have more than 2 */
-struct mca_bus *mca_root_busses[MAX_MCA_BUSSES];
+static struct mca_bus *mca_root_busses[MAX_MCA_BUSSES];
 
 #define MCA_DEVINFO(i,s) { .pos = i, .name = s }
 
include/linux/mca-legacy.h renamed from include/linux/mca-legacy.h.old +0 -5
@@ -34,10 +34,6 @@
 extern int mca_find_adapter(int id, int start);
 extern int mca_find_unused_adapter(int id, int start);
 
-/* adapter state info - returns 0 if no */
-extern int mca_isadapter(int slot);
-extern int mca_isenabled(int slot);
-
 extern int mca_is_adapter_used(int slot);
 extern int mca_mark_as_used(int slot);
 extern void mca_mark_as_unused(int slot);
@@ -50,7 +46,6 @@
  * so we can have a more interesting /proc/mca.
  */
 extern void mca_set_adapter_name(int slot, char* name);
-extern char* mca_get_adapter_name(int slot);
 
 /* These routines actually mess with the hardware POS registers.  They
  * temporarily disable the device (and interrupts), so make sure you know
drivers/mca/mca-legacy.c renamed from drivers/mca/mca-legacy.c.old +0 -59

68 lines not on this page · raw message

drivers/mca/mca-proc.c renamed from drivers/mca/mca-proc.c.old +2 -2
@@ -43,8 +43,8 @@
 	return len;
 }
 
-int get_mca_info(char *page, char **start, off_t off,
-		 int count, int *eof, void *data)
+static int get_mca_info(char *page, char **start, off_t off,
+			int count, int *eof, void *data)
 {
 	int i, len = 0;