From fed37a1e70df88f020db1e53403d70ce67f0802f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 28 May 2014 16:26:35 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_mio_common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index e8409b0d58bc..a6edb9442a38 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 | -- 2.34.1