Commit 196540ee authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3120: remove private data 'ai_running' 



This member of the private data was used to determine if the interrupt
routine was handling data for the (*insn_read) or an async command. Now
that the (*insn_read) does not use interrupts this member is not needed.

Remove the member and refactor the code.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3da98237

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+14 −27
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ static int apci3120_reset(struct comedi_device *dev) 
{

	struct apci3120_private *devpriv = dev->private;



	devpriv->ai_running = 0;

	devpriv->b_InterruptMode = APCI3120_EOC_MODE;



	/*  variables used in timer subdevice */
@@ -246,7 +245,6 @@ static int apci3120_cancel(struct comedi_device *dev, 
	inw(dev->iobase + APCI3120_STATUS_REG);

	devpriv->ui_DmaActualBuffer = 0;



	devpriv->ai_running = 0;

	devpriv->b_InterruptMode = APCI3120_EOC_MODE;



	return 0;
@@ -338,8 +336,6 @@ static int apci3120_cyclic_ai(int mode, 
	unsigned int dmalen1 = 0;

	unsigned int divisor0;



	devpriv->ai_running = 1;



	/*  clear software  registers */

	devpriv->timer_mode = 0;

	devpriv->mode = 0;
@@ -775,7 +771,6 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 


	if ((status & APCI3120_STATUS_EOS_INT) &&

	    devpriv->b_InterruptMode == APCI3120_EOS_MODE) {

		if (devpriv->ai_running) {

		unsigned short val;

		int i;
@@ -787,7 +782,6 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 
		devpriv->mode |= APCI3120_MODE_EOS_IRQ_ENA;

		outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG);

	}

	}



	if (status & APCI3120_STATUS_TIMER2_INT) {

		switch (devpriv->b_Timer2Mode) {
@@ -821,8 +815,6 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 


	if ((status & APCI3120_STATUS_AMCC_INT) &&

	    devpriv->b_InterruptMode == APCI3120_DMA_MODE) {

		if (devpriv->ai_running) {



		/* Clear Timer Write TC int */

		outl(APCI3120_CLEAR_WRITE_TC_INT,

			devpriv->amcc + APCI3120_AMCC_OP_REG_INTCSR);
@@ -831,11 +823,6 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 


		/* do some data transfer */

		apci3120_interrupt_dma(irq, d);

		} else {

			apci3120_timer_enable(dev, 0, false);

			apci3120_timer_enable(dev, 1, false);

		}



	}

	comedi_handle_events(dev, s);

drivers/staging/comedi/drivers/addi_apci_3120.c

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ struct apci3120_private { 
	unsigned short ctrl;

	unsigned char b_Timer2Mode;

	unsigned char b_Timer2Interrupt;

	unsigned int ai_running:1;

	unsigned char b_InterruptMode;

	unsigned char b_ExttrigEnable;

	struct task_struct *tsk_Current;