diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-19 10:11:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-21 12:39:38 -0800 |
| commit | a3ab029e8389de87f7e0b7af0fda21c5041d877f (patch) | |
| tree | 95ceb9ffac214f4087e583aa3bc58ab66837d7b8 | |
| parent | f23068ec57acd6fb0bf4c69075072350a5ff849a (diff) | |
staging: comedi: pcl816: 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl816.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index a8302daf4301..0d2eaa9fc04c 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -138,8 +138,6 @@ static int check_channel_list(struct comedi_device *dev, static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int *chanlist, unsigned int seglen); -static int pcl816_ai_cancel(struct comedi_device *dev, - struct comedi_subdevice *s); static void pcl816_start_pacer(struct comedi_device *dev, bool load_counters) { @@ -242,7 +240,7 @@ static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, void *d) if (!timeout) { /* timeout, bail error */ outb(0, dev->iobase + PCL816_CLRINT); /* clear INT request */ comedi_error(dev, "A/D mode1/3 IRQ without DRDY!"); - pcl816_ai_cancel(dev, s); + s->cancel(dev, s); s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; comedi_event(dev, s); return IRQ_HANDLED; @@ -266,7 +264,7 @@ static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, void *d) /* all data sampled */ if (devpriv->ai_act_scan >= cmd->stop_arg) { /* all data sampled */ - pcl816_ai_cancel(dev, s); + s->cancel(dev, s); s->async->events |= COMEDI_CB_EOA; } comedi_event(dev, s); @@ -306,7 +304,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) { - pcl816_ai_cancel(dev, s); + s->cancel(dev, s); s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_BLOCK; break; |