summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/m32r_pcc.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2009-10-23 12:56:46 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-08 18:23:13 +0100
commitc9f50dddd184a020d64dab63fa795967f0f14aa4 (patch)
treeb8de3c6e2860141e12fec7ba52bd25ef329590ae /drivers/pcmcia/m32r_pcc.c
parentpcmcia: use dynamic debug instead of custom infrastructure (diff)
downloadlinux-c9f50dddd184a020d64dab63fa795967f0f14aa4.tar.xz
linux-c9f50dddd184a020d64dab63fa795967f0f14aa4.zip
pcmcia: use dynamic debug in PCMCIA socket drivers
Make use of the dynamic debug infrastructure in various PCMCIA socket drivers. By doing so, only the drivers relying on soc_common make use of CONFIG_PCMCIA_DEBUG. Therefore, update the Kconfig entry accordingly. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/m32r_pcc.c')
-rw-r--r--drivers/pcmcia/m32r_pcc.c51
1 files changed, 20 insertions, 31 deletions
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index c6524f99ccc3..72844c5a6d05 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -45,16 +45,6 @@
#define PCC_DEBUG_DBEX
-#ifdef CONFIG_PCMCIA_DEBUG
-static int m32r_pcc_debug;
-module_param(m32r_pcc_debug, int, 0644);
-#define debug(lvl, fmt, arg...) do { \
- if (m32r_pcc_debug > (lvl)) \
- printk(KERN_DEBUG "m32r_pcc: " fmt , ## arg); \
-} while (0)
-#else
-#define debug(n, args...) do { } while (0)
-#endif
/* Poll status interval -- 0 means default to interrupt */
static int poll_interval = 0;
@@ -358,7 +348,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev)
u_int events, active;
int handled = 0;
- debug(4, "m32r: pcc_interrupt(%d)\n", irq);
+ pr_debug("m32r_pcc: pcc_interrupt(%d)\n", irq);
for (j = 0; j < 20; j++) {
active = 0;
@@ -369,13 +359,14 @@ static irqreturn_t pcc_interrupt(int irq, void *dev)
handled = 1;
irc = pcc_get(i, PCIRC);
irc >>=16;
- debug(2, "m32r-pcc:interrupt: socket %d pcirc 0x%02x ", i, irc);
+ pr_debug("m32r_pcc: interrupt: socket %d pcirc 0x%02x ",
+ i, irc);
if (!irc)
continue;
events = (irc) ? SS_DETECT : 0;
events |= (pcc_get(i,PCCR) & PCCR_PCEN) ? SS_READY : 0;
- debug(2, " event 0x%02x\n", events);
+ pr_debug("m32r_pcc: event 0x%02x\n", events);
if (events)
pcmcia_parse_events(&socket[i].socket, events);
@@ -388,7 +379,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev)
if (j == 20)
printk(KERN_NOTICE "m32r-pcc: infinite loop in interrupt handler\n");
- debug(4, "m32r-pcc: interrupt done\n");
+ pr_debug("m32r_pcc: interrupt done\n");
return IRQ_RETVAL(handled);
} /* pcc_interrupt */
@@ -422,7 +413,7 @@ static int _pcc_get_status(u_short sock, u_int *value)
status = pcc_get(sock,PCCSIGCR);
*value |= (status & PCCSIGCR_VEN) ? SS_POWERON : 0;
- debug(3, "m32r-pcc: GetStatus(%d) = %#4.4x\n", sock, *value);
+ pr_debug("m32r_pcc: GetStatus(%d) = %#4.4x\n", sock, *value);
return 0;
} /* _get_status */
@@ -432,7 +423,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)
{
u_long reg = 0;
- debug(3, "m32r-pcc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
+ pr_debug("m32r_pcc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
"io_irq %d, csc_mask %#2.2x)", sock, state->flags,
state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
@@ -448,11 +439,11 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)
}
if (state->flags & SS_RESET) {
- debug(3, ":RESET\n");
+ pr_debug("m32r_pcc: :RESET\n");
reg |= PCCSIGCR_CRST;
}
if (state->flags & SS_OUTPUT_ENA){
- debug(3, ":OUTPUT_ENA\n");
+ pr_debug("m32r_pcc: :OUTPUT_ENA\n");
/* bit clear */
} else {
reg |= PCCSIGCR_SEN;
@@ -460,28 +451,26 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)
pcc_set(sock,PCCSIGCR,reg);
-#ifdef CONFIG_PCMCIA_DEBUG
if(state->flags & SS_IOCARD){
- debug(3, ":IOCARD");
+ pr_debug("m32r_pcc: :IOCARD");
}
if (state->flags & SS_PWR_AUTO) {
- debug(3, ":PWR_AUTO");
+ pr_debug("m32r_pcc: :PWR_AUTO");
}
if (state->csc_mask & SS_DETECT)
- debug(3, ":csc-SS_DETECT");
+ pr_debug("m32r_pcc: :csc-SS_DETECT");
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG)
- debug(3, ":STSCHG");
+ pr_debug("m32r_pcc: :STSCHG");
} else {
if (state->csc_mask & SS_BATDEAD)
- debug(3, ":BATDEAD");
+ pr_debug("m32r_pcc: :BATDEAD");
if (state->csc_mask & SS_BATWARN)
- debug(3, ":BATWARN");
+ pr_debug("m32r_pcc: :BATWARN");
if (state->csc_mask & SS_READY)
- debug(3, ":READY");
+ pr_debug("m32r_pcc: :READY");
}
- debug(3, "\n");
-#endif
+ pr_debug("m32r_pcc: \n");
return 0;
} /* _set_socket */
@@ -491,7 +480,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
{
u_char map;
- debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
+ pr_debug("m32r_pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#llx-%#llx)\n", sock, io->map, io->flags,
io->speed, (unsigned long long)io->start,
(unsigned long long)io->stop);
@@ -515,7 +504,7 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem)
#endif
#endif
- debug(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, "
+ pr_debug("m32r_pcc: SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#llx, %#x)\n", sock, map, mem->flags,
mem->speed, (unsigned long long)mem->static_start,
mem->card_start);
@@ -662,7 +651,7 @@ static int pcc_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem)
static int pcc_init(struct pcmcia_socket *s)
{
- debug(4, "m32r-pcc: init call\n");
+ pr_debug("m32r_pcc: init call\n");
return 0;
}