From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 23 Apr 2014 22:57:16 +0000 (-0700)
Subject: staging: comedi: amplc_pci224: remove pci224_cascade_ns_to_timer()
X-Git-Tag: next-20140428~14^2~186
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5aae190100727086d7a752cd9d2f3889ff7359fe;p=karo-tx-linux.git

staging: comedi: amplc_pci224: remove pci224_cascade_ns_to_timer()

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>
---

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 3b9a8b9ae39c..a34bd9db10c0 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -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);
 		}
 
 		/*