Commit a6f97b29 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

drivers/char: minor irq handler cleanups 



- remove always-false tests

- don't overload 'irq' argument, pass data properly via dev_id

- remove pointless casts from void*

Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent e8f39549

drivers/char/mwave/tp3780i.c

+10 −4
Original line number Diff line number Diff line
@@ -97,20 +97,24 @@ static void EnableSRAM(THINKPAD_BD_DATA * pBDData) 


static irqreturn_t UartInterrupt(int irq, void *dev_id)

{

	int irqno = (int)(unsigned long) dev_id;



	PRINTK_3(TRACE_TP3780I,

		"tp3780i::UartInterrupt entry irq %x dev_id %p\n", irq, dev_id);

		"tp3780i::UartInterrupt entry irq %x dev_id %p\n", irqno, dev_id);

	return IRQ_HANDLED;

}



static irqreturn_t DspInterrupt(int irq, void *dev_id)

{

	int irqno = (int)(unsigned long) dev_id;



	pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;

	DSP_3780I_CONFIG_SETTINGS *pSettings = &pDrvData->rBDData.rDspSettings;

	unsigned short usDspBaseIO = pSettings->usDspBaseIO;

	unsigned short usIPCSource = 0, usIsolationMask, usPCNum;



	PRINTK_3(TRACE_TP3780I,

		"tp3780i::DspInterrupt entry irq %x dev_id %p\n", irq, dev_id);

		"tp3780i::DspInterrupt entry irq %x dev_id %p\n", irqno, dev_id);



	if (dsp3780I_GetIPCSource(usDspBaseIO, &usIPCSource) == 0) {

		PRINTK_2(TRACE_TP3780I,
@@ -361,14 +365,16 @@ int tp3780I_EnableDSP(THINKPAD_BD_DATA * pBDData) 
	pSettings->bPllBypass = TP_CFG_PllBypass;

	pSettings->usChipletEnable = TP_CFG_ChipletEnable;



	if (request_irq(pSettings->usUartIrq, &UartInterrupt, 0, "mwave_uart", NULL)) {

	if (request_irq(pSettings->usUartIrq, &UartInterrupt, 0, "mwave_uart",

			(void *)(unsigned long) pSettings->usUartIrq)) {

		PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_EnableDSP: Error: Could not get UART IRQ %x\n", pSettings->usUartIrq);

		goto exit_cleanup;

	} else {		/* no conflict just release */

		free_irq(pSettings->usUartIrq, NULL);

	}



	if (request_irq(pSettings->usDspIrq, &DspInterrupt, 0, "mwave_3780i", NULL)) {

	if (request_irq(pSettings->usDspIrq, &DspInterrupt, 0, "mwave_3780i",

			(void *)(unsigned long) pSettings->usDspIrq)) {

		PRINTK_ERROR("tp3780i::tp3780I_EnableDSP: Error: Could not get 3780i IRQ %x\n", pSettings->usDspIrq);

		goto exit_cleanup;

	} else {

drivers/char/pcmcia/synclink_cs.c

+4 −6
Original line number Diff line number Diff line
@@ -1225,17 +1225,15 @@ static void ri_change(MGSLPC_INFO *info) 
 * irq     interrupt number that caused interrupt

 * dev_id  device ID supplied during interrupt registration

 */

static irqreturn_t mgslpc_isr(int irq, void *dev_id)

static irqreturn_t mgslpc_isr(int dummy, void *dev_id)

{

	MGSLPC_INFO * info = (MGSLPC_INFO *)dev_id;

	MGSLPC_INFO *info = dev_id;

	unsigned short isr;

	unsigned char gis, pis;

	int count=0;



	if (debug_level >= DEBUG_LEVEL_ISR)

		printk("mgslpc_isr(%d) entry.\n", irq);

	if (!info)

		return IRQ_NONE;

		printk("mgslpc_isr(%d) entry.\n", info->irq_level);



	if (!(info->p_dev->_locked))

		return IRQ_HANDLED;
@@ -1327,7 +1325,7 @@ static irqreturn_t mgslpc_isr(int irq, void *dev_id) 


	if (debug_level >= DEBUG_LEVEL_ISR)

		printk("%s(%d):mgslpc_isr(%d)exit.\n",

		       __FILE__,__LINE__,irq);

		       __FILE__, __LINE__, info->irq_level);



	return IRQ_HANDLED;

}

drivers/char/specialix.c

+4 −6
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ void missed_irq (unsigned long data) 
	spin_unlock_irqrestore(&bp->lock, flags);

	if (irq) {

		printk (KERN_INFO "Missed interrupt... Calling int from timer. \n");

		sx_interrupt (((struct specialix_board *)data)->irq,

				(void*)data);

		sx_interrupt (-1, bp);

	}

	mod_timer(&missed_irq_timer, jiffies + sx_poll);

}
@@ -862,23 +861,22 @@ static inline void sx_check_modem(struct specialix_board * bp) 




/* The main interrupt processing routine */

static irqreturn_t sx_interrupt(int irq, void *dev_id)

static irqreturn_t sx_interrupt(int dummy, void *dev_id)

{

	unsigned char status;

	unsigned char ack;

	struct specialix_board *bp;

	struct specialix_board *bp = dev_id;

	unsigned long loop = 0;

	int saved_reg;

	unsigned long flags;



	func_enter();



	bp = dev_id;

	spin_lock_irqsave(&bp->lock, flags);



	dprintk (SX_DEBUG_FLOW, "enter %s port %d room: %ld\n", __FUNCTION__, port_No(sx_get_port(bp, "INT")), SERIAL_XMIT_SIZE - sx_get_port(bp, "ITN")->xmit_cnt - 1);

	if (!(bp->flags & SX_BOARD_ACTIVE)) {

		dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", irq);

		dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", bp->irq);

		spin_unlock_irqrestore(&bp->lock, flags);

		func_exit();

		return IRQ_NONE;

drivers/char/stallion.c

+1 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ static irqreturn_t stl_intr(int irq, void *dev_id) 
{

	struct stlbrd *brdp = dev_id;



	pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, irq);

	pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, brdp->irq);



	return IRQ_RETVAL((* brdp->isr)(brdp));

}

drivers/char/synclink.c

+9 −12
Original line number Diff line number Diff line
@@ -1695,19 +1695,15 @@ static void mgsl_isr_transmit_dma( struct mgsl_struct *info ) 
 * 	

 * Return Value: None

 */

static irqreturn_t mgsl_interrupt(int irq, void *dev_id)

static irqreturn_t mgsl_interrupt(int dummy, void *dev_id)

{

	struct mgsl_struct * info;

	struct mgsl_struct *info = dev_id;

	u16 UscVector;

	u16 DmaVector;



	if ( debug_level >= DEBUG_LEVEL_ISR )	

		printk("%s(%d):mgsl_interrupt(%d)entry.\n",

			__FILE__,__LINE__,irq);



	info = (struct mgsl_struct *)dev_id;	

	if (!info)

		return IRQ_NONE;

		printk(KERN_DEBUG "%s(%d):mgsl_interrupt(%d)entry.\n",

			__FILE__, __LINE__, info->irq_level);



	spin_lock(&info->irq_spinlock);
@@ -1733,7 +1729,7 @@ static irqreturn_t mgsl_interrupt(int irq, void *dev_id) 


		if ( info->isr_overflow ) {

			printk(KERN_ERR "%s(%d):%s isr overflow irq=%d\n",

				__FILE__,__LINE__,info->device_name, irq);

				__FILE__, __LINE__, info->device_name, info->irq_level);

			usc_DisableMasterIrqBit(info);

			usc_DisableDmaInterrupts(info,DICR_MASTER);

			break;
@@ -1755,8 +1751,9 @@ static irqreturn_t mgsl_interrupt(int irq, void *dev_id) 
	spin_unlock(&info->irq_spinlock);

	

	if ( debug_level >= DEBUG_LEVEL_ISR )	

		printk("%s(%d):mgsl_interrupt(%d)exit.\n",

			__FILE__,__LINE__,irq);

		printk(KERN_DEBUG "%s(%d):mgsl_interrupt(%d)exit.\n",

			__FILE__, __LINE__, info->irq_level);



	return IRQ_HANDLED;

}	/* end of mgsl_interrupt() */