staging: comedi: cb_pcidas: remove forward declarations 7

Move the caldac_8800_write function, and it's helper, to remove
the need for the forward declaration.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 1e5616e15fb56a2efdea53561540faefb85d93e0..28bcb64cbf0f65c2d81628d45d87938f2bfda98b 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -447,8 +447,6 @@ struct cb_pcidas_private {
  */
 #define devpriv ((struct cb_pcidas_private *)dev->private)
 
-static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
-                            uint8_t value);
 static int trimpot_7376_write(struct comedi_device *dev, uint8_t value);
 static int trimpot_8402_write(struct comedi_device *dev, unsigned int channel,
                              uint8_t value);
@@ -638,6 +636,54 @@ static int eeprom_read_insn(struct comedi_device *dev,
        return 1;
 }
 
+static void write_calibration_bitstream(struct comedi_device *dev,
+                                       unsigned int register_bits,
+                                       unsigned int bitstream,
+                                       unsigned int bitstream_length)
+{
+       static const int write_delay = 1;
+       unsigned int bit;
+
+       for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
+               if (bitstream & bit)
+                       register_bits |= SERIAL_DATA_IN_BIT;
+               else
+                       register_bits &= ~SERIAL_DATA_IN_BIT;
+               udelay(write_delay);
+               outw(register_bits, devpriv->control_status + CALIBRATION_REG);
+       }
+}
+
+static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
+                            uint8_t value)
+{
+       static const int num_caldac_channels = 8;
+       static const int bitstream_length = 11;
+       unsigned int bitstream = ((address & 0x7) << 8) | value;
+       static const int caldac_8800_udelay = 1;
+
+       if (address >= num_caldac_channels) {
+               comedi_error(dev, "illegal caldac channel");
+               return -1;
+       }
+
+       if (value == devpriv->caldac_value[address])
+               return 1;
+
+       devpriv->caldac_value[address] = value;
+
+       write_calibration_bitstream(dev, cal_enable_bits(dev), bitstream,
+                                   bitstream_length);
+
+       udelay(caldac_8800_udelay);
+       outw(cal_enable_bits(dev) | SELECT_8800_BIT,
+            devpriv->control_status + CALIBRATION_REG);
+       udelay(caldac_8800_udelay);
+       outw(cal_enable_bits(dev), devpriv->control_status + CALIBRATION_REG);
+
+       return 1;
+}
+
 static int caldac_write_insn(struct comedi_device *dev,
                             struct comedi_subdevice *s,
                             struct comedi_insn *insn, unsigned int *data)
@@ -1456,54 +1502,6 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
        return IRQ_HANDLED;
 }
 
-static void write_calibration_bitstream(struct comedi_device *dev,
-                                       unsigned int register_bits,
-                                       unsigned int bitstream,
-                                       unsigned int bitstream_length)
-{
-       static const int write_delay = 1;
-       unsigned int bit;
-
-       for (bit = 1 << (bitstream_length - 1); bit; bit >>= 1) {
-               if (bitstream & bit)
-                       register_bits |= SERIAL_DATA_IN_BIT;
-               else
-                       register_bits &= ~SERIAL_DATA_IN_BIT;
-               udelay(write_delay);
-               outw(register_bits, devpriv->control_status + CALIBRATION_REG);
-       }
-}
-
-static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
-                            uint8_t value)
-{
-       static const int num_caldac_channels = 8;
-       static const int bitstream_length = 11;
-       unsigned int bitstream = ((address & 0x7) << 8) | value;
-       static const int caldac_8800_udelay = 1;
-
-       if (address >= num_caldac_channels) {
-               comedi_error(dev, "illegal caldac channel");
-               return -1;
-       }
-
-       if (value == devpriv->caldac_value[address])
-               return 1;
-
-       devpriv->caldac_value[address] = value;
-
-       write_calibration_bitstream(dev, cal_enable_bits(dev), bitstream,
-                                   bitstream_length);
-
-       udelay(caldac_8800_udelay);
-       outw(cal_enable_bits(dev) | SELECT_8800_BIT,
-            devpriv->control_status + CALIBRATION_REG);
-       udelay(caldac_8800_udelay);
-       outw(cal_enable_bits(dev), devpriv->control_status + CALIBRATION_REG);
-
-       return 1;
-}
-
 static int trimpot_7376_write(struct comedi_device *dev, uint8_t value)
 {
        static const int bitstream_length = 7;