Skip to contentSkip to conversation

drivers/mmc/wbsd.c: possible cleanups

PATCH In review Adrian Bunk 2 participants 2 messages Apr 19, 2005 MMC, SD and SDIO

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 drivers/mmc/wbsd.c: possible cleanups

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 <[email protected]>

---

 drivers/mmc/wbsd.c |   30 ++++++++----------------------
 drivers/mmc/wbsd.h |    7 -------
 2 files changed, 8 insertions(+), 29 deletions(-)
drivers/mmc/wbsd.h renamed from drivers/mmc/wbsd.h.old +0 -7
@@ -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
drivers/mmc/wbsd.c renamed from drivers/mmc/wbsd.c.old +8 -22
@@ -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
  */
#1 lore raw
Quoted 5 lines · 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 <[email protected]>

Adrian,

Please note that we're still not fully up and running with a subsitute development infrastructure, so I'm still not in a position to seriously start merging patches. Please hold off until there's an official announcement to the contary, thanks.

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