small MCA cleanups (fwd)

The patch forwarded below still applies and compiles against 2.6.10-rc2-mm3.

Please apply.

----- Forwarded message from Adrian Bunk <[email protected]> -----

Date: Sun, 7 Nov 2004 13:11:12 +0100
From: Adrian Bunk <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [2.6 patch] 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(-)

@@ -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 }
 

@@ -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

@@ -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;
 

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

----- End forwarded message -----

Being waaaaaay to busy at work to care about MCA-related things anymore, combined with the fact that I didn't bring along any of my old MCA-machines when I moved the last time, I've asked James Bottomley to take over the MCA maintainership.

I don't have anything to object against these patches, but I'm not able to test them...

Regards: David Weinehall

 /) David Weinehall <[email protected]> /) Northern lights wander      (\
//  Maintainer of the v2.0 kernel   //  Dance across the winter sky //
\)  http://www.acc.umu.se/~tao/    (/   Full colour fire           (/

OK .. I said I'd do it, so here is the formal change of the maintainer. Note that I too only have a limited subset of MCA hardware ... the voyager systems have a kind of super MCA bus that didn't have any of the MCA bus limitations in the original IBM spec, so a lot of the MCA HW I have doesn't work on ordinary MCA busses. The only standard MCA cards I have are networking ones.

James

--

Change MCA maintainer

===== MAINTAINERS 1.256 vs edited =====

@@ -1451,11 +1451,8 @@
 S:	Maintained
 
 MISCELLANEOUS MCA-SUPPORT
-P:	David Weinehall
-M:	Project MCA Team <[email protected]>
-M:	David Weinehall <[email protected]>
-W:	http://www.acc.umu.se/~tao/
-W:	http://www.acc.umu.se/~mcalinux/
+P:	James Bottomley
+M:	[email protected]
 L:	[email protected]
 S:	Maintained
 

Would you like some more. I can send you some SCSI, networking and video ones if that would be useful (Ethernet/2, MCA NE2K, 3c523/7, IBM SCSI etc)

Sure ... I have buslogic SCSI, smc_mca and 3c529, but some of the others could do with converting to the new MCA API...

James