[2.6 patch] small MCA cleanups (fwd)

[2.6 patch] small MCA cleanups (fwd)

[Adrian Bunk]

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

Please apply.


----- Forwarded message from Adrian Bunk <bunk@stusta.de> -----

Date:	Sun, 7 Nov 2004 13:11:12 +0100
From: Adrian Bunk <bunk@stusta.de>
To: tao@acc.umu.se
Cc: linux-kernel@vger.kernel.org
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(-)


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc1-mm3-full/drivers/mca/mca-bus.c.old	2004-11-07 12:29:40.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/mca/mca-bus.c	2004-11-07 12:30:01.000000000 +0100
@@ -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 }
 
--- linux-2.6.10-rc1-mm3-full/include/linux/mca-legacy.h.old	2004-11-07 12:31:22.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/include/linux/mca-legacy.h	2004-11-07 12:31:44.000000000 +0100
@@ -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
--- linux-2.6.10-rc1-mm3-full/drivers/mca/mca-legacy.c.old	2004-11-07 12:30:12.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/mca/mca-legacy.c	2004-11-07 12:31:09.000000000 +0100
@@ -283,25 +283,6 @@
 EXPORT_SYMBOL(mca_set_adapter_name);
 
 /**
- *	mca_get_adapter_name - get the adapter description
- *	@slot:	slot to query
- *
- *	Return the adapter description if set. If it has not been
- *	set or the slot is out range then return NULL.
- */
-
-char *mca_get_adapter_name(int slot)
-{
-	struct mca_device *mca_dev = mca_find_device_by_slot(slot);
-
-	if(!mca_dev)
-		return NULL;
-
-	return mca_device_get_name(mca_dev);
-}
-EXPORT_SYMBOL(mca_get_adapter_name);
-
-/**
  *	mca_is_adapter_used - check if claimed by driver
  *	@slot:	slot to check
  *
@@ -365,43 +346,3 @@
 }
 EXPORT_SYMBOL(mca_mark_as_unused);
 
-/**
- *	mca_isadapter - check if the slot holds an adapter
- *	@slot:	slot to query
- *
- *	Returns zero if the slot does not hold an adapter, non zero if
- *	it does.
- */
-
-int mca_isadapter(int slot)
-{
-	struct mca_device *mca_dev = mca_find_device_by_slot(slot);
-	enum MCA_AdapterStatus status;
-
-	if(!mca_dev)
-		return 0;
-
-	status = mca_device_status(mca_dev);
-
-	return status == MCA_ADAPTER_NORMAL
-		|| status == MCA_ADAPTER_DISABLED;
-}
-EXPORT_SYMBOL(mca_isadapter);
-
-/**
- *	mca_isenabled - check if the slot holds an enabled adapter
- *	@slot:	slot to query
- *
- *	Returns a non zero value if the slot holds an enabled adapter
- *	and zero for any other case.
- */
-
-int mca_isenabled(int slot)
-{
-	struct mca_device *mca_dev = mca_find_device_by_slot(slot);
-
-	if(!mca_dev)
-		return 0;
-
-	return mca_device_status(mca_dev) == MCA_ADAPTER_NORMAL;
-}
--- linux-2.6.10-rc1-mm3-full/drivers/mca/mca-proc.c.old	2004-11-07 12:31:53.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/mca/mca-proc.c	2004-11-07 12:33:30.000000000 +0100
@@ -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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Re: [2.6 patch] small MCA cleanups (fwd)

[David Weinehall]

On Wed, Nov 24, 2004 at 03:04:27AM +0100, Adrian Bunk wrote:
> 
> The patch forwarded below still applies and compiles against 
> 2.6.10-rc2-mm3.
> 
> Please apply.

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 <tao@acc.umu.se> /) Northern lights wander      (\
//  Maintainer of the v2.0 kernel   //  Dance across the winter sky //
\)  http://www.acc.umu.se/~tao/    (/   Full colour fire           (/

Re: [2.6 patch] small MCA cleanups (fwd)

[James Bottomley]

On Wed, 2004-11-24 at 01:59, David Weinehall wrote:
> 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...

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

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

===== MAINTAINERS 1.256 vs edited =====
--- 1.256/MAINTAINERS	2004-11-11 02:34:32 -06:00
+++ edited/MAINTAINERS	2004-11-28 10:09:19 -06:00
@@ -1451,11 +1451,8 @@
 S:	Maintained
 
 MISCELLANEOUS MCA-SUPPORT
-P:	David Weinehall
-M:	Project MCA Team <mcalinux@acc.umu.se>
-M:	David Weinehall <tao@acc.umu.se>
-W:	http://www.acc.umu.se/~tao/
-W:	http://www.acc.umu.se/~mcalinux/
+P:	James Bottomley
+M:	jejb@steeleye.com
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 

Re: [2.6 patch] small MCA cleanups (fwd)

[Alan Cox]

On Sul, 2004-11-28 at 16:13, James Bottomley wrote:
> 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.

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)

Re: [2.6 patch] small MCA cleanups (fwd)

[James Bottomley]

On Sun, 2004-11-28 at 11:10, Alan Cox wrote:
> On Sul, 2004-11-28 at 16:13, James Bottomley wrote:
> > 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.

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

James