Commit c9f50ddd authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent d50dbec3

drivers/pcmcia/Kconfig

+18 −18
Original line number Diff line number Diff line
@@ -17,24 +17,6 @@ menuconfig PCCARD 


if PCCARD



config PCMCIA_DEBUG

	bool "Enable PCCARD debugging"

	help

	  Say Y here to enable PCMCIA subsystem debugging.  You

	  will need to choose the debugging level either via the

	  kernel command line, or module options depending whether

	  you build the PCMCIA as modules.



	  The kernel command line options are:

	    pcmcia_core.pc_debug=N

	    pcmcia.pc_debug=N

	    sa11xx_core.pc_debug=N



	  The module option is called pc_debug=N



	  In all the above examples, N is the debugging verbosity

	  level.



config PCMCIA

	tristate "16-bit PCMCIA support"

	select CRC32
@@ -225,6 +207,24 @@ config PCMCIA_PXA2XX 
	help

	  Say Y here to include support for the PXA2xx PCMCIA controller



config PCMCIA_DEBUG

	bool "Enable debugging"

	depends on (PCMCIA_SA1111 || PCMCIA_SA1100 || PCMCIA_PXA2XX)

	help

	  Say Y here to enable debugging for the SoC PCMCIA layer.

	  You will need to choose the debugging level either via the

	  kernel command line, or module options depending whether

	  you build the drivers as modules.



	  The kernel command line options are:

	    sa11xx_core.pc_debug=N

	    pxa2xx_core.pc_debug=N



	  The module option is called pc_debug=N



	  In all the above examples, N is the debugging verbosity

	  level.



config PCMCIA_PROBE

	bool

	default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X && !PARISC

drivers/pcmcia/i82365.c

+11 −26
Original line number Diff line number Diff line
@@ -63,21 +63,6 @@ 
#include "vg468.h"

#include "ricoh.h"



#ifdef CONFIG_PCMCIA_DEBUG

static const char version[] =

"i82365.c 1.265 1999/11/10 18:36:21 (David Hinds)";



static int pc_debug;



module_param(pc_debug, int, 0644);



#define debug(lvl, fmt, arg...) do {				\

	if (pc_debug > (lvl))					\

		printk(KERN_DEBUG "i82365: " fmt , ## arg);	\

} while (0)

#else

#define debug(lvl, fmt, arg...) do { } while (0)

#endif



static irqreturn_t i365_count_irq(int, void *);

static inline int _check_irq(int irq, int flags)
@@ -501,13 +486,13 @@ static irqreturn_t i365_count_irq(int irq, void *dev) 
{

    i365_get(irq_sock, I365_CSC);

    irq_hits++;

    debug(2, "-> hit on irq %d\n", irq);

    pr_debug("i82365: -> hit on irq %d\n", irq);

    return IRQ_HANDLED;

}



static u_int __init test_irq(u_short sock, int irq)

{

    debug(2, "  testing ISA irq %d\n", irq);

    pr_debug("i82365:  testing ISA irq %d\n", irq);

    if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan",

			i365_count_irq) != 0)

	return 1;
@@ -515,7 +500,7 @@ static u_int __init test_irq(u_short sock, int irq) 
    msleep(10);

    if (irq_hits) {

	free_irq(irq, i365_count_irq);

	debug(2, "    spurious hit!\n");

	pr_debug("i82365:    spurious hit!\n");

	return 1;

    }
@@ -528,7 +513,7 @@ static u_int __init test_irq(u_short sock, int irq) 


    /* mask all interrupts */

    i365_set(sock, I365_CSCINT, 0);

    debug(2, "    hits = %d\n", irq_hits);

    pr_debug("i82365:    hits = %d\n", irq_hits);

    

    return (irq_hits != 1);

}
@@ -854,7 +839,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) 
    u_long flags = 0;

    int handled = 0;



    debug(4, "pcic_interrupt(%d)\n", irq);

    pr_debug("pcic_interrupt(%d)\n", irq);



    for (j = 0; j < 20; j++) {

	active = 0;
@@ -878,7 +863,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) 
		events |= (csc & I365_CSC_READY) ? SS_READY : 0;

	    }

	    ISA_UNLOCK(i, flags);

	    debug(2, "socket %d event 0x%02x\n", i, events);

	    pr_debug("socket %d event 0x%02x\n", i, events);



	    if (events)

		pcmcia_parse_events(&socket[i].socket, events);
@@ -890,7 +875,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev) 
    if (j == 20)

	printk(KERN_NOTICE "i82365: infinite loop in interrupt handler\n");



    debug(4, "interrupt done\n");

    pr_debug("pcic_interrupt done\n");

    return IRQ_RETVAL(handled);

} /* pcic_interrupt */
@@ -932,7 +917,7 @@ static int i365_get_status(u_short sock, u_int *value) 
	}

    }

    

    debug(1, "GetStatus(%d) = %#4.4x\n", sock, *value);

    pr_debug("GetStatus(%d) = %#4.4x\n", sock, *value);

    return 0;

} /* i365_get_status */
@@ -943,7 +928,7 @@ static int i365_set_socket(u_short sock, socket_state_t *state) 
    struct i82365_socket *t = &socket[sock];

    u_char reg;

    

    debug(1, "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

    pr_debug("SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

	  "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags,

	  state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
@@ -1052,7 +1037,7 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io) 
{

    u_char map, ioctl;

    

    debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "

    pr_debug("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);

    map = io->map;
@@ -1082,7 +1067,7 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem) 
    u_short base, i;

    u_char map;

    

    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, "

    pr_debug("SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, "

	  "%#x)\n", sock, mem->map, mem->flags, mem->speed,

	  (unsigned long long)mem->res->start,

	  (unsigned long long)mem->res->end, mem->card_start);

drivers/pcmcia/m32r_cfc.c

+46 −59
Original line number Diff line number Diff line
@@ -38,17 +38,6 @@ 


#include "m32r_cfc.h"



#ifdef CONFIG_PCMCIA_DEBUG

static int m32r_cfc_debug;

module_param(m32r_cfc_debug, int, 0644);

#define debug(lvl, fmt, arg...) do {				\

	if (m32r_cfc_debug > (lvl))				\

		printk(KERN_DEBUG "m32r_cfc: " 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;
@@ -123,7 +112,7 @@ void pcc_ioread_byte(int sock, unsigned long port, void *buf, size_t size, 
	unsigned char *bp = (unsigned char *)buf;

	unsigned long flags;



	debug(3, "m32r_cfc: pcc_ioread_byte: sock=%d, port=%#lx, buf=%p, "

	pr_debug("m32r_cfc: pcc_ioread_byte: sock=%d, port=%#lx, buf=%p, "

		 "size=%u, nmemb=%d, flag=%d\n",

		  sock, port, buf, size, nmemb, flag);
@@ -132,7 +121,7 @@ void pcc_ioread_byte(int sock, unsigned long port, void *buf, size_t size, 
		printk("m32r_cfc:ioread_byte null port :%#lx\n",port);

		return;

	}

	debug(3, "m32r_cfc: pcc_ioread_byte: addr=%#lx\n", addr);

	pr_debug("m32r_cfc: pcc_ioread_byte: addr=%#lx\n", addr);



	spin_lock_irqsave(&pcc_lock, flags);

	/* read Byte */
@@ -148,7 +137,7 @@ void pcc_ioread_word(int sock, unsigned long port, void *buf, size_t size, 
	unsigned short *bp = (unsigned short *)buf;

	unsigned long flags;



	debug(3, "m32r_cfc: pcc_ioread_word: sock=%d, port=%#lx, "

	pr_debug("m32r_cfc: pcc_ioread_word: sock=%d, port=%#lx, "

		 "buf=%p, size=%u, nmemb=%d, flag=%d\n",

		 sock, port, buf, size, nmemb, flag);
@@ -163,7 +152,7 @@ void pcc_ioread_word(int sock, unsigned long port, void *buf, size_t size, 
		printk("m32r_cfc:ioread_word null port :%#lx\n",port);

		return;

	}

	debug(3, "m32r_cfc: pcc_ioread_word: addr=%#lx\n", addr);

	pr_debug("m32r_cfc: pcc_ioread_word: addr=%#lx\n", addr);



	spin_lock_irqsave(&pcc_lock, flags);

	/* read Word */
@@ -179,7 +168,7 @@ void pcc_iowrite_byte(int sock, unsigned long port, void *buf, size_t size, 
	unsigned char *bp = (unsigned char *)buf;

	unsigned long flags;



	debug(3, "m32r_cfc: pcc_iowrite_byte: sock=%d, port=%#lx, "

	pr_debug("m32r_cfc: pcc_iowrite_byte: sock=%d, port=%#lx, "

		 "buf=%p, size=%u, nmemb=%d, flag=%d\n",

		 sock, port, buf, size, nmemb, flag);
@@ -189,7 +178,7 @@ void pcc_iowrite_byte(int sock, unsigned long port, void *buf, size_t size, 
		printk("m32r_cfc:iowrite_byte null port:%#lx\n",port);

		return;

	}

	debug(3, "m32r_cfc: pcc_iowrite_byte: addr=%#lx\n", addr);

	pr_debug("m32r_cfc: pcc_iowrite_byte: addr=%#lx\n", addr);



	spin_lock_irqsave(&pcc_lock, flags);

	while (nmemb--)
@@ -204,7 +193,7 @@ void pcc_iowrite_word(int sock, unsigned long port, void *buf, size_t size, 
	unsigned short *bp = (unsigned short *)buf;

	unsigned long flags;



	debug(3, "m32r_cfc: pcc_iowrite_word: sock=%d, port=%#lx, "

	pr_debug("m32r_cfc: pcc_iowrite_word: sock=%d, port=%#lx, "

		 "buf=%p, size=%u, nmemb=%d, flag=%d\n",

		 sock, port, buf, size, nmemb, flag);
@@ -226,7 +215,7 @@ void pcc_iowrite_word(int sock, unsigned long port, void *buf, size_t size, 
		return;

	}

#endif

	debug(3, "m32r_cfc: pcc_iowrite_word: addr=%#lx\n", addr);

	pr_debug("m32r_cfc: pcc_iowrite_word: addr=%#lx\n", addr);



	spin_lock_irqsave(&pcc_lock, flags);

	while (nmemb--)
@@ -262,7 +251,7 @@ static struct timer_list poll_timer; 
static unsigned int pcc_get(u_short sock, unsigned int reg)

{

	unsigned int val = inw(reg);

	debug(3, "m32r_cfc: pcc_get: reg(0x%08x)=0x%04x\n", reg, val);

	pr_debug("m32r_cfc: pcc_get: reg(0x%08x)=0x%04x\n", reg, val);

	return val;

}
@@ -270,7 +259,7 @@ static unsigned int pcc_get(u_short sock, unsigned int reg) 
static void pcc_set(u_short sock, unsigned int reg, unsigned int data)

{

	outw(data, reg);

	debug(3, "m32r_cfc: pcc_set: reg(0x%08x)=0x%04x\n", reg, data);

	pr_debug("m32r_cfc: pcc_set: reg(0x%08x)=0x%04x\n", reg, data);

}



/*======================================================================
@@ -286,14 +275,14 @@ static int __init is_alive(u_short sock) 
{

	unsigned int stat;



	debug(3, "m32r_cfc: is_alive:\n");

	pr_debug("m32r_cfc: is_alive:\n");



	printk("CF: ");

	stat = pcc_get(sock, (unsigned int)PLD_CFSTS);

	if (!stat)

		printk("No ");

	printk("Card is detected at socket %d : stat = 0x%08x\n", sock, stat);

	debug(3, "m32r_cfc: is_alive: sock stat is 0x%04x\n", stat);

	pr_debug("m32r_cfc: is_alive: sock stat is 0x%04x\n", stat);



	return 0;

}
@@ -303,7 +292,7 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr, 
{

	pcc_socket_t *t = &socket[pcc_sockets];



	debug(3, "m32r_cfc: add_pcc_socket: base=%#lx, irq=%d, "

	pr_debug("m32r_cfc: add_pcc_socket: base=%#lx, irq=%d, "

		 "mapaddr=%#lx, ioaddr=%08x\n",

		 base, irq, mapaddr, ioaddr);
@@ -358,7 +347,7 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr, 
	/* eject interrupt */

	request_irq(irq+1, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt);

#endif

	debug(3, "m32r_cfc: enable CFMSK, RDYSEL\n");

	pr_debug("m32r_cfc: enable CFMSK, RDYSEL\n");

	pcc_set(pcc_sockets, (unsigned int)PLD_CFIMASK, 0x01);

#endif	/* CONFIG_PLAT_USRV */

#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)
@@ -378,26 +367,26 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) 
	u_int events = 0;

	int handled = 0;



	debug(3, "m32r_cfc: pcc_interrupt: irq=%d, dev=%p\n", irq, dev);

	pr_debug("m32r_cfc: pcc_interrupt: irq=%d, dev=%p\n", irq, dev);

	for (i = 0; i < pcc_sockets; i++) {

		if (socket[i].cs_irq1 != irq && socket[i].cs_irq2 != irq)

			continue;



		handled = 1;

		debug(3, "m32r_cfc: pcc_interrupt: socket %d irq 0x%02x ",

		pr_debug("m32r_cfc: pcc_interrupt: socket %d irq 0x%02x ",

			i, irq);

		events |= SS_DETECT;	/* insert or eject */

		if (events)

			pcmcia_parse_events(&socket[i].socket, events);

	}

	debug(3, "m32r_cfc: pcc_interrupt: done\n");

	pr_debug("m32r_cfc: pcc_interrupt: done\n");



	return IRQ_RETVAL(handled);

} /* pcc_interrupt */



static void pcc_interrupt_wrapper(u_long data)

{

	debug(3, "m32r_cfc: pcc_interrupt_wrapper:\n");

	pr_debug("m32r_cfc: pcc_interrupt_wrapper:\n");

	pcc_interrupt(0, NULL);

	init_timer(&poll_timer);

	poll_timer.expires = jiffies + poll_interval;
@@ -410,17 +399,17 @@ static int _pcc_get_status(u_short sock, u_int *value) 
{

	u_int status;



	debug(3, "m32r_cfc: _pcc_get_status:\n");

	pr_debug("m32r_cfc: _pcc_get_status:\n");

	status = pcc_get(sock, (unsigned int)PLD_CFSTS);

	*value = (status) ? SS_DETECT : 0;

 	debug(3, "m32r_cfc: _pcc_get_status: status=0x%08x\n", status);

	pr_debug("m32r_cfc: _pcc_get_status: status=0x%08x\n", status);



#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)

	if ( status ) {

		/* enable CF power */

		status = inw((unsigned int)PLD_CPCR);

		if (!(status & PLD_CPCR_CF)) {

			debug(3, "m32r_cfc: _pcc_get_status: "

			pr_debug("m32r_cfc: _pcc_get_status: "

				 "power on (CPCR=0x%08x)\n", status);

			status |= PLD_CPCR_CF;

			outw(status, (unsigned int)PLD_CPCR);
@@ -439,7 +428,7 @@ static int _pcc_get_status(u_short sock, u_int *value) 
		status &= ~PLD_CPCR_CF;

		outw(status, (unsigned int)PLD_CPCR);

		udelay(100);

		debug(3, "m32r_cfc: _pcc_get_status: "

		pr_debug("m32r_cfc: _pcc_get_status: "

			 "power off (CPCR=0x%08x)\n", status);

	}

#elif defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
@@ -465,13 +454,13 @@ static int _pcc_get_status(u_short sock, u_int *value) 
		/* disable CF power */

	        pcc_set(sock, (unsigned int)PLD_CPCR, 0);

		udelay(100);

		debug(3, "m32r_cfc: _pcc_get_status: "

		pr_debug("m32r_cfc: _pcc_get_status: "

			 "power off (CPCR=0x%08x)\n", status);

	}

#else

#error no platform configuration

#endif

	debug(3, "m32r_cfc: _pcc_get_status: GetStatus(%d) = %#4.4x\n",

	pr_debug("m32r_cfc: _pcc_get_status: GetStatus(%d) = %#4.4x\n",

		 sock, *value);

	return 0;

} /* _get_status */
@@ -480,7 +469,7 @@ static int _pcc_get_status(u_short sock, u_int *value) 


static int _pcc_set_socket(u_short sock, socket_state_t *state)

{

	debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

	pr_debug("m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

		  "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags,

		  state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
@@ -492,41 +481,39 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state) 
	}

#endif

	if (state->flags & SS_RESET) {

		debug(3, ":RESET\n");

		pr_debug(":RESET\n");

		pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x101);

	}else{

		pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x100);

	}

	if (state->flags & SS_OUTPUT_ENA){

		debug(3, ":OUTPUT_ENA\n");

		pr_debug(":OUTPUT_ENA\n");

		/* bit clear */

		pcc_set(sock,(unsigned int)PLD_CFBUFCR,0);

	} else {

		pcc_set(sock,(unsigned int)PLD_CFBUFCR,1);

	}



#ifdef CONFIG_PCMCIA_DEBUG

	if(state->flags & SS_IOCARD){

		debug(3, ":IOCARD");

		pr_debug(":IOCARD");

	}

	if (state->flags & SS_PWR_AUTO) {

		debug(3, ":PWR_AUTO");

		pr_debug(":PWR_AUTO");

	}

	if (state->csc_mask & SS_DETECT)

		debug(3, ":csc-SS_DETECT");

		pr_debug(":csc-SS_DETECT");

	if (state->flags & SS_IOCARD) {

		if (state->csc_mask & SS_STSCHG)

			debug(3, ":STSCHG");

			pr_debug(":STSCHG");

	} else {

		if (state->csc_mask & SS_BATDEAD)

			debug(3, ":BATDEAD");

			pr_debug(":BATDEAD");

		if (state->csc_mask & SS_BATWARN)

			debug(3, ":BATWARN");

			pr_debug(":BATWARN");

		if (state->csc_mask & SS_READY)

			debug(3, ":READY");

			pr_debug(":READY");

	}

	debug(3, "\n");

#endif

	pr_debug("\n");

	return 0;

} /* _set_socket */
@@ -536,7 +523,7 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) 
{

	u_char map;



	debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, "

	pr_debug("m32r_cfc: 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);
@@ -554,7 +541,7 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) 
	u_long addr;

	pcc_socket_t *t = &socket[sock];



	debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, "

	pr_debug("m32r_cfc: 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);
@@ -640,11 +627,11 @@ static int pcc_get_status(struct pcmcia_socket *s, u_int *value) 
	unsigned int sock = container_of(s, struct pcc_socket, socket)->number;



	if (socket[sock].flags & IS_ALIVE) {

		debug(3, "m32r_cfc: pcc_get_status: sock(%d) -EINVAL\n", sock);

		dev_dbg(&s->dev, "pcc_get_status: sock(%d) -EINVAL\n", sock);

		*value = 0;

		return -EINVAL;

	}

	debug(3, "m32r_cfc: pcc_get_status: sock(%d)\n", sock);

	dev_dbg(&s->dev, "pcc_get_status: sock(%d)\n", sock);

	LOCKED(_pcc_get_status(sock, value));

}
@@ -653,10 +640,10 @@ static int pcc_set_socket(struct pcmcia_socket *s, socket_state_t *state) 
	unsigned int sock = container_of(s, struct pcc_socket, socket)->number;



	if (socket[sock].flags & IS_ALIVE) {

		debug(3, "m32r_cfc: pcc_set_socket: sock(%d) -EINVAL\n", sock);

		dev_dbg(&s->dev, "pcc_set_socket: sock(%d) -EINVAL\n", sock);

		return -EINVAL;

	}

	debug(3, "m32r_cfc: pcc_set_socket: sock(%d)\n", sock);

	dev_dbg(&s->dev, "pcc_set_socket: sock(%d)\n", sock);

	LOCKED(_pcc_set_socket(sock, state));

}
@@ -665,10 +652,10 @@ static int pcc_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io) 
	unsigned int sock = container_of(s, struct pcc_socket, socket)->number;



	if (socket[sock].flags & IS_ALIVE) {

		debug(3, "m32r_cfc: pcc_set_io_map: sock(%d) -EINVAL\n", sock);

		dev_dbg(&s->dev, "pcc_set_io_map: sock(%d) -EINVAL\n", sock);

		return -EINVAL;

	}

	debug(3, "m32r_cfc: pcc_set_io_map: sock(%d)\n", sock);

	dev_dbg(&s->dev, "pcc_set_io_map: sock(%d)\n", sock);

	LOCKED(_pcc_set_io_map(sock, io));

}
@@ -677,16 +664,16 @@ static int pcc_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem) 
	unsigned int sock = container_of(s, struct pcc_socket, socket)->number;



	if (socket[sock].flags & IS_ALIVE) {

		debug(3, "m32r_cfc: pcc_set_mem_map: sock(%d) -EINVAL\n", sock);

		dev_dbg(&s->dev, "pcc_set_mem_map: sock(%d) -EINVAL\n", sock);

		return -EINVAL;

	}

	debug(3, "m32r_cfc: pcc_set_mem_map: sock(%d)\n", sock);

	dev_dbg(&s->dev, "pcc_set_mem_map: sock(%d)\n", sock);

	LOCKED(_pcc_set_mem_map(sock, mem));

}



static int pcc_init(struct pcmcia_socket *s)

{

	debug(3, "m32r_cfc: pcc_init()\n");

	dev_dbg(&s->dev, "pcc_init()\n");

	return 0;

}

drivers/pcmcia/m32r_pcc.c

+20 −31
Original line number Diff line number Diff line
@@ -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;

}

drivers/pcmcia/m8xx_pcmcia.c

+16 −24
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ 
#include <pcmcia/cs.h>

#include <pcmcia/ss.h>



#ifdef CONFIG_PCMCIA_DEBUG

static int pc_debug;

module_param(pc_debug, int, 0);

#define dprintk(args...) printk(KERN_DEBUG "m8xx_pcmcia: " args);

#else

#define dprintk(args...)

#endif



#define pcmcia_info(args...) printk(KERN_INFO "m8xx_pcmcia: "args)

#define pcmcia_error(args...) printk(KERN_ERR "m8xx_pcmcia: "args)
@@ -565,7 +557,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) 
	unsigned int i, events, pscr, pipr, per;

	pcmconf8xx_t *pcmcia = socket[0].pcmcia;



	dprintk("Interrupt!\n");

	pr_debug("m8xx_pcmcia: Interrupt!\n");

	/* get interrupt sources */



	pscr = in_be32(&pcmcia->pcmc_pscr);
@@ -614,7 +606,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) 


		/* call the handler */



		dprintk("slot %u: events = 0x%02x, pscr = 0x%08x, "

		pr_debug("m8xx_pcmcia: slot %u: events = 0x%02x, pscr = 0x%08x, "

			"pipr = 0x%08x\n", i, events, pscr, pipr);



		if (events) {
@@ -641,7 +633,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) 
	/* clear the interrupt sources */

	out_be32(&pcmcia->pcmc_pscr, pscr);



	dprintk("Interrupt done.\n");

	pr_debug("m8xx_pcmcia: Interrupt done.\n");



	return IRQ_HANDLED;

}
@@ -815,7 +807,7 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) 
		};

	}



	dprintk("GetStatus(%d) = %#2.2x\n", lsock, *value);

	pr_debug("m8xx_pcmcia: GetStatus(%d) = %#2.2x\n", lsock, *value);

	return 0;

}
@@ -828,7 +820,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t * state) 
	unsigned long flags;

	pcmconf8xx_t *pcmcia = socket[0].pcmcia;



	dprintk("SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

	pr_debug("m8xx_pcmcia: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "

		"io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags,

		state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
@@ -974,7 +966,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) 
#define M8XX_SIZE (io->stop - io->start + 1)

#define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start)



	dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, "

	pr_debug("m8xx_pcmcia: SetIOMap(%d, %d, %#2.2x, %d ns, "

		"%#4.4llx-%#4.4llx)\n", lsock, io->map, io->flags,

		io->speed, (unsigned long long)io->start,

		(unsigned long long)io->stop);
@@ -988,7 +980,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) 


	if (io->flags & MAP_ACTIVE) {



		dprintk("io->flags & MAP_ACTIVE\n");

		pr_debug("m8xx_pcmcia: io->flags & MAP_ACTIVE\n");



		winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO)

		    + (lsock * PCMCIA_IO_WIN_NO) + io->map;
@@ -1018,8 +1010,8 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) 


		out_be32(&w->or, reg);



		dprintk("Socket %u: Mapped io window %u at %#8.8x, "

			"OR = %#8.8x.\n", lsock, io->map, w->br, w->or);

		pr_debug("m8xx_pcmcia: Socket %u: Mapped io window %u at "

			"%#8.8x, OR = %#8.8x.\n", lsock, io->map, w->br, w->or);

	} else {

		/* shutdown IO window */

		winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO)
@@ -1033,14 +1025,14 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) 
		out_be32(&w->or, 0);	/* turn off window */

		out_be32(&w->br, 0);	/* turn off base address */



		dprintk("Socket %u: Unmapped io window %u at %#8.8x, "

			"OR = %#8.8x.\n", lsock, io->map, w->br, w->or);

		pr_debug("m8xx_pcmcia: Socket %u: Unmapped io window %u at "

			"%#8.8x, OR = %#8.8x.\n", lsock, io->map, w->br, w->or);

	}



	/* copy the struct and modify the copy */

	s->io_win[io->map] = *io;

	s->io_win[io->map].flags &= (MAP_WRPROT | MAP_16BIT | MAP_ACTIVE);

	dprintk("SetIOMap exit\n");

	pr_debug("m8xx_pcmcia: SetIOMap exit\n");



	return 0;

}
@@ -1055,7 +1047,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, 
	unsigned int reg, winnr;

	pcmconf8xx_t *pcmcia = s->pcmcia;



	dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "

	pr_debug("m8xx_pcmcia: SetMemMap(%d, %d, %#2.2x, %d ns, "

		"%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags,

		mem->speed, (unsigned long long)mem->static_start,

		mem->card_start);
@@ -1098,7 +1090,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, 


	out_be32(&w->or, reg);



	dprintk("Socket %u: Mapped memory window %u at %#8.8x, "

	pr_debug("m8xx_pcmcia: Socket %u: Mapped memory window %u at %#8.8x, "

		"OR = %#8.8x.\n", lsock, mem->map, w->br, w->or);



	if (mem->flags & MAP_ACTIVE) {
@@ -1108,7 +1100,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, 
		    + mem->card_start;

	}



	dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "

	pr_debug("m8xx_pcmcia: SetMemMap(%d, %d, %#2.2x, %d ns, "

		"%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags,

		mem->speed, (unsigned long long)mem->static_start,

		mem->card_start);
@@ -1129,7 +1121,7 @@ static int m8xx_sock_init(struct pcmcia_socket *sock) 
	pccard_io_map io = { 0, 0, 0, 0, 1 };

	pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 };



	dprintk("sock_init(%d)\n", s);

	pr_debug("m8xx_pcmcia: sock_init(%d)\n", s);



	m8xx_set_socket(sock, &dead_socket);

	for (i = 0; i < PCMCIA_IO_WIN_NO; i++) {