From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 17 Feb 2014 21:27:40 +0000 (-0700)
Subject: staging: comedi: pcl812: use subdevice (*cancel)
X-Git-Tag: firefly_0821_release~176^2~4193^2~943
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=81272ba1240eff306eb93c56bc5901d02ca43cc3;p=firefly-linux-kernel-4.4.55.git

staging: comedi: pcl812: use subdevice (*cancel)

Use the subdevice (*cancel) operation to remove the need for a forward
declaration.

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/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 0d7d3ae99514..d0708f8326df 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -536,8 +536,6 @@ struct pcl812_private {
 static void setup_range_channel(struct comedi_device *dev,
 				struct comedi_subdevice *s,
 				unsigned int rangechan, char wait);
-static int pcl812_ai_cancel(struct comedi_device *dev,
-			    struct comedi_subdevice *s);
 
 static void pcl812_start_pacer(struct comedi_device *dev, bool load_timers)
 {
@@ -911,7 +909,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
 
 	if (err) {
 		dev_dbg(dev->class_dev, "A/D cmd IRQ without DRDY!\n");
-		pcl812_ai_cancel(dev, s);
+		s->cancel(dev, s);
 		s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
 		comedi_event(dev, s);
 		return IRQ_HANDLED;
@@ -935,7 +933,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
 		if (!(devpriv->ai_neverending))
 							/* all data sampled */
 			if (devpriv->ai_act_scan >= cmd->stop_arg) {
-				pcl812_ai_cancel(dev, s);
+				s->cancel(dev, s);
 				s->async->events |= COMEDI_CB_EOA;
 			}
 	}
@@ -968,7 +966,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
 			if (!devpriv->ai_neverending)
 							/* all data sampled */
 				if (devpriv->ai_act_scan >= cmd->stop_arg) {
-					pcl812_ai_cancel(dev, s);
+					s->cancel(dev, s);
 					s->async->events |= COMEDI_CB_EOA;
 					break;
 				}