[2.6 patch] drivers/mmc/wbsd.c: possible cleanups

[2.6 patch] drivers/mmc/wbsd.c: possible cleanups

[Adrian Bunk]

This patch contains the following possible cleanups:
- make some needlessly global code static
- remove the unneeded global function DBG_REG

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

---

This patch was already sent on:
- 1 May 2005
- 19 Apr 2005

 drivers/mmc/wbsd.c |   30 ++++++++----------------------
 drivers/mmc/wbsd.h |    7 -------
 2 files changed, 8 insertions(+), 29 deletions(-)

--- linux-2.6.12-rc2-mm3-full/drivers/mmc/wbsd.h.old	2005-04-19 02:56:24.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/mmc/wbsd.h	2005-04-19 02:57:17.000000000 +0200
@@ -8,13 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-const int config_ports[] = { 0x2E, 0x4E };
-const int unlock_codes[] = { 0x83, 0x87 };
-
-const int valid_ids[] = {
-	0x7112,
-	};
-
 #define LOCK_CODE		0xAA
 
 #define WBSD_CONF_SWRST		0x02
--- linux-2.6.12-rc2-mm3-full/drivers/mmc/wbsd.c.old	2005-04-19 02:55:39.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/mmc/wbsd.c	2005-04-19 02:57:06.000000000 +0200
@@ -52,32 +52,18 @@
 #define DBGF(x...)	do { } while (0)
 #endif
 
+static const int config_ports[] = { 0x2E, 0x4E };
+static const int unlock_codes[] = { 0x83, 0x87 };
+
+static const int valid_ids[] = {
+	0x7112,
+	};
+
+
 static unsigned int io = 0x248;
 static unsigned int irq = 6;
 static int dma = 2;
 
-#ifdef CONFIG_MMC_DEBUG
-void DBG_REG(int reg, u8 value)
-{
-	int i;
-	
-	printk(KERN_DEBUG "wbsd: Register %d: 0x%02X %3d '%c' ",
-		reg, (int)value, (int)value, (value < 0x20)?'.':value);
-	
-	for (i = 7;i >= 0;i--)
-	{
-		if (value & (1 << i))
-			printk("x");
-		else
-			printk(".");
-	}
-	
-	printk("\n");
-}
-#else
-#define DBG_REG(r, v) do {}  while (0)
-#endif
-
 /*
  * Basic functions
  */

Re: [Wbsd-devel] [2.6 patch] drivers/mmc/wbsd.c: possible cleanups

[Pierre Ossman]

Adrian Bunk wrote:
> This patch contains the following possible cleanups:
> - make some needlessly global code static
> - remove the unneeded global function DBG_REG
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 

This patch looks fine to me, so go ahead and apply it Russell.

Rgds
Pierre

Re: [2.6 patch] drivers/mmc/wbsd.c: possible cleanups

[Russell King]

On Fri, May 13, 2005 at 02:47:55AM +0200, Adrian Bunk wrote:
> This patch contains the following possible cleanups:
> - make some needlessly global code static
> - remove the unneeded global function DBG_REG
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

I'm not applying this patch because it conflicts with other changes from
Pierre which have already been merged.  Please re-send after Linus returns
and this driver has been updated in mainline.  Thanks.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core