From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 4 Nov 2014 17:54:34 +0000 (-0700)
Subject: staging: comedi: addi_apci_3120: absorb apci3120_interrupt_handle_eos()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bb201b94cc251584bb69ed9e1f002d886f66fd4b;p=deliverable%2Flinux.git

staging: comedi: addi_apci_3120: absorb apci3120_interrupt_handle_eos()

Absorb this simple function into apci3120_interrupt().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 5fb884835643..1913fd2f29dd 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -747,25 +747,6 @@ static void apci3120_interrupt_dma(int irq, void *d)
 	}
 }
 
-/*
- * This function handles EOS interrupt.
- * This function copies the acquired data(from FIFO) to Comedi buffer.
- */
-static int apci3120_interrupt_handle_eos(struct comedi_device *dev)
-{
-	struct apci3120_private *devpriv = dev->private;
-	struct comedi_subdevice *s = dev->read_subdev;
-	unsigned short val;
-	int i;
-
-	for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) {
-		val = inw(dev->iobase + 0);
-		comedi_buf_write_samples(s, &val, 1);
-	}
-
-	return 0;
-}
-
 static irqreturn_t apci3120_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
@@ -807,7 +788,14 @@ static irqreturn_t apci3120_interrupt(int irq, void *d)
 	/*  Check If EOS interrupt */
 	if ((int_daq & 0x2) && (devpriv->b_InterruptMode == APCI3120_EOS_MODE)) {
 		if (devpriv->ai_running) {
-			apci3120_interrupt_handle_eos(dev);
+			unsigned short val;
+			int i;
+
+			for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) {
+				val = inw(dev->iobase + 0);
+				comedi_buf_write_samples(s, &val, 1);
+			}
+
 			devpriv->mode |= APCI3120_MODE_EOS_IRQ_ENA;
 			outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG);
 		}