staging: comedi: ni_mio_common: remove forward declaration 18

Move ni_ai_drain_dma() to remove the need for the 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>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 2a592a4d6e8cb8a7917579891324f9b4e7152e9c..5a33b24f464b3c1ca3588c2ed3736b6b27443062 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -321,8 +321,6 @@ static inline void ni_set_bitfield(struct comedi_device *dev, int reg,
 }
 
 #ifdef PCIDMA
-static int ni_ai_drain_dma(struct comedi_device *dev);
-
 /* DMA channel setup */
 
 /* negative channel means no channel */
@@ -783,6 +781,41 @@ static void ni_sync_ai_dma(struct comedi_device *dev)
        spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
 }
 
+static int ni_ai_drain_dma(struct comedi_device *dev)
+{
+       struct ni_private *devpriv = dev->private;
+       int i;
+       static const int timeout = 10000;
+       unsigned long flags;
+       int retval = 0;
+
+       spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
+       if (devpriv->ai_mite_chan) {
+               for (i = 0; i < timeout; i++) {
+                       if ((devpriv->stc_readw(dev,
+                                               AI_Status_1_Register) &
+                            AI_FIFO_Empty_St)
+                           && mite_bytes_in_transit(devpriv->ai_mite_chan) ==
+                           0)
+                               break;
+                       udelay(5);
+               }
+               if (i == timeout) {
+                       printk("ni_mio_common: wait for dma drain timed out\n");
+                       printk
+                           ("mite_bytes_in_transit=%i, AI_Status1_Register=0x%x\n",
+                            mite_bytes_in_transit(devpriv->ai_mite_chan),
+                            devpriv->stc_readw(dev, AI_Status_1_Register));
+                       retval = -1;
+               }
+       }
+       spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
+
+       ni_sync_ai_dma(dev);
+
+       return retval;
+}
+
 static void mite_handle_b_linkc(struct mite_struct *mite,
                                struct comedi_device *dev)
 {
@@ -1272,42 +1305,6 @@ static void ni_handle_fifo_half_full(struct comedi_device *dev)
 }
 #endif
 
-#ifdef PCIDMA
-static int ni_ai_drain_dma(struct comedi_device *dev)
-{
-       struct ni_private *devpriv = dev->private;
-       int i;
-       static const int timeout = 10000;
-       unsigned long flags;
-       int retval = 0;
-
-       spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
-       if (devpriv->ai_mite_chan) {
-               for (i = 0; i < timeout; i++) {
-                       if ((devpriv->stc_readw(dev,
-                                               AI_Status_1_Register) &
-                            AI_FIFO_Empty_St)
-                           && mite_bytes_in_transit(devpriv->ai_mite_chan) ==
-                           0)
-                               break;
-                       udelay(5);
-               }
-               if (i == timeout) {
-                       printk("ni_mio_common: wait for dma drain timed out\n");
-                       printk
-                           ("mite_bytes_in_transit=%i, AI_Status1_Register=0x%x\n",
-                            mite_bytes_in_transit(devpriv->ai_mite_chan),
-                            devpriv->stc_readw(dev, AI_Status_1_Register));
-                       retval = -1;
-               }
-       }
-       spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
-
-       ni_sync_ai_dma(dev);
-
-       return retval;
-}
-#endif
 /*
    Empties the AI fifo
 */