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

staging: comedi: addi_apci_3120: change params to apci3120_interrupt_dma() 



Pass the comedi_device and comedi_subdevice pointers to this function instead
of the irq number and void pointer.

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 cd68e0e2

drivers/staging/comedi/drivers/addi_apci_3120.c

+3 −4
Original line number Diff line number Diff line
@@ -435,11 +435,10 @@ static void apci3120_set_chanlist(struct comedi_device *dev, 
		devpriv->mode |= APCI3120_MODE_SCAN_ENA;

}



static void apci3120_interrupt_dma(int irq, void *d)

static void apci3120_interrupt_dma(struct comedi_device *dev,

				   struct comedi_subdevice *s)

{

	struct comedi_device *dev = d;

	struct apci3120_private *devpriv = dev->private;

	struct comedi_subdevice *s = dev->read_subdev;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;

	struct apci3120_dmabuf *dmabuf;
@@ -549,7 +548,7 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 
		outl(AINT_WT_COMPLETE, devpriv->amcc + AMCC_OP_REG_INTCSR);



		/* do some data transfer */

		apci3120_interrupt_dma(irq, d);

		apci3120_interrupt_dma(dev, s);

	}



	if (cmd->stop_src == TRIG_COUNT && async->scans_done >= cmd->stop_arg)