diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-05-28 23:26:35 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-18 21:33:51 (GMT) |
| commit | fed37a1e70df88f020db1e53403d70ce67f0802f (patch) | |
| tree | 86ce255fc6cc1d2cce9dc73915ba59d3540c9790 /drivers/staging/comedi | |
| parent | 0792928fd61dd5371a0dab64b6cbee40fbbbdc14 (diff) | |
| download | linux-fed37a1e70df88f020db1e53403d70ce67f0802f.tar.xz | |
staging: comedi: ni_mio_common: remove forward declaration 12
Remove the need for the forward declaration of ni_cdio_cancel() by
indirectly calling it using the subdevice (*cancel).
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index e8409b0..a6edb94 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -194,8 +194,6 @@ static const struct comedi_lrange *const ni_range_lkup[] = { [ai_gain_6143] = &range_bipolar5 }; -static int ni_cdio_cancel(struct comedi_device *dev, - struct comedi_subdevice *s); static void handle_cdio_interrupt(struct comedi_device *dev); static int ni_serial_hw_readwrite8(struct comedi_device *dev, @@ -3485,7 +3483,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, } if (i == timeout) { comedi_error(dev, "dma failed to fill cdo fifo!"); - ni_cdio_cancel(dev, s); + s->cancel(dev, s); return -EIO; } ni_writel(CDO_Arm_Bit | CDO_Error_Interrupt_Enable_Set_Bit | |