Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



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

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 f4985a79

drivers/staging/comedi/drivers/pcl812.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

				}