staging: comedi: amplc_pci224: remove pci224_cascade_ns_to_timer()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 23 Apr 2014 22:57:16 +0000 (15:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2014 22:02:59 +0000 (15:02 -0700)
This function is just a wrapper around i8253_cascade_ns_to_timer().
Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pci224.c

index 3b9a8b9ae39ca8ab1ecc6d448577677a401d592b..a34bd9db10c0289210dcbaf1389250ec867ffe97 100644 (file)
@@ -466,16 +466,6 @@ pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s,
        return i;
 }
 
-/*
- * Just a wrapper for the inline function 'i8253_cascade_ns_to_timer'.
- */
-static void
-pci224_cascade_ns_to_timer(int osc_base, unsigned int *d1, unsigned int *d2,
-                          unsigned int *nanosec, int round_mode)
-{
-       i8253_cascade_ns_to_timer(osc_base, d1, d2, nanosec, round_mode);
-}
-
 /*
  * Kills a command running on the AO subdevice.
  */
@@ -886,10 +876,10 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                        /* Use two timers. */
                        div1 = devpriv->cached_div1;
                        div2 = devpriv->cached_div2;
-                       pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
-                                                  &div1, &div2,
-                                                  &cmd->scan_begin_arg,
-                                                  round_mode);
+                       i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
+                                                 &div1, &div2,
+                                                 &cmd->scan_begin_arg,
+                                                 round_mode);
                        devpriv->cached_div1 = div1;
                        devpriv->cached_div2 = div2;
                }
@@ -1001,9 +991,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                        /* Use two timers. */
                        div1 = devpriv->cached_div1;
                        div2 = devpriv->cached_div2;
-                       pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
-                                                  &div1, &div2,
-                                                  &ns, round_mode);
+                       i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
+                                                 &div1, &div2,
+                                                 &ns, round_mode);
                }
 
                /*