]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: cb_pcidas: remove forward declarations 6
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 27 Jun 2012 00:49:58 +0000 (17:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 22:23:49 +0000 (15:23 -0700)
Move the cb_pcidas_load_counters function 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>
drivers/staging/comedi/drivers/cb_pcidas.c

index 24574082691e2c8ef646f3a6c65db1cfb86db213..1e5616e15fb56a2efdea53561540faefb85d93e0 100644 (file)
@@ -447,8 +447,6 @@ struct cb_pcidas_private {
  */
 #define devpriv ((struct cb_pcidas_private *)dev->private)
 
-static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns,
-                                   int round_flags);
 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);
@@ -915,6 +913,20 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
        return 0;
 }
 
+static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns,
+                                   int rounding_flags)
+{
+       i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1),
+                                      &(devpriv->divisor2), ns,
+                                      rounding_flags & TRIG_ROUND_MASK);
+
+       /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
+       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 1,
+                  devpriv->divisor1, 2);
+       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 2,
+                  devpriv->divisor2, 2);
+}
+
 static int cb_pcidas_ai_cmd(struct comedi_device *dev,
                            struct comedi_subdevice *s)
 {
@@ -1444,20 +1456,6 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
        return IRQ_HANDLED;
 }
 
-static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns,
-                                   int rounding_flags)
-{
-       i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1),
-                                      &(devpriv->divisor2), ns,
-                                      rounding_flags & TRIG_ROUND_MASK);
-
-       /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
-       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 1,
-                  devpriv->divisor1, 2);
-       i8254_load(devpriv->pacer_counter_dio + ADC8254, 0, 2,
-                  devpriv->divisor2, 2);
-}
-
 static void write_calibration_bitstream(struct comedi_device *dev,
                                        unsigned int register_bits,
                                        unsigned int bitstream,