diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-17 14:27:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 11:56:50 -0800 |
| commit | 81272ba1240eff306eb93c56bc5901d02ca43cc3 (patch) | |
| tree | ddf81d139249815da0afbfd082a3e2ffaabec43b | |
| parent | f4985a79ca5ba6a2eb0edeb3125a7e763c3e6cc2 (diff) | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl812.c | 8 |
1 files changed, 3 insertions, 5 deletions
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; } |