Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aae1901 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 170b09b0

drivers/staging/comedi/drivers/amplc_pci224.c

+7 −17
Original line number Original line Diff line number Diff line
@@ -466,16 +466,6 @@ pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, 
	return i;

	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.

 * Kills a command running on the AO subdevice.

 */

 */
@@ -886,7 +876,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
			/* Use two timers. */

			/* Use two timers. */

			div1 = devpriv->cached_div1;

			div1 = devpriv->cached_div1;

			div2 = devpriv->cached_div2;

			div2 = devpriv->cached_div2;

			pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

			i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

						  &div1, &div2,

						  &div1, &div2,

						  &cmd->scan_begin_arg,

						  &cmd->scan_begin_arg,

						  round_mode);

						  round_mode);
@@ -1001,7 +991,7 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
			/* Use two timers. */

			/* Use two timers. */

			div1 = devpriv->cached_div1;

			div1 = devpriv->cached_div1;

			div2 = devpriv->cached_div2;

			div2 = devpriv->cached_div2;

			pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

			i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

						  &div1, &div2,

						  &div1, &div2,

						  &ns, round_mode);

						  &ns, round_mode);

		}

		}