Commit c5665dfb authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_pci230: convert CLK_CONFIG() macro to function

Convert the `CLK_CONFIG(chan, src)` macro to a static function
`pci230_clk_config(chan, src)`.  This is consistent with an earlier
change to convert `GAT_CONFIG(chan, src)` to a static function.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 112d55e5
...@@ -376,8 +376,11 @@ ...@@ -376,8 +376,11 @@
#define CLK_1KHZ 5 /* internal 1 kHz clock */ #define CLK_1KHZ 5 /* internal 1 kHz clock */
#define CLK_OUTNM1 6 /* output of channel-1 modulo total */ #define CLK_OUTNM1 6 /* output of channel-1 modulo total */
#define CLK_EXT 7 /* external clock */ #define CLK_EXT 7 /* external clock */
/* Macro to construct clock input configuration register value. */
#define CLK_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) static unsigned int pci230_clk_config(unsigned int chan, unsigned int src)
{
return ((chan & 3) << 3) | (src & 7);
}
/* /*
* Counter/timer gate input configuration sources. * Counter/timer gate input configuration sources.
...@@ -697,7 +700,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct, ...@@ -697,7 +700,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct,
/* Determine clock source and count. */ /* Determine clock source and count. */
clk_src = pci230_choose_clk_count(ns, &count, flags); clk_src = pci230_choose_clk_count(ns, &count, flags);
/* Program clock source. */ /* Program clock source. */
outb(CLK_CONFIG(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE); outb(pci230_clk_config(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE);
/* Set initial count. */ /* Set initial count. */
if (count >= 65536) if (count >= 65536)
count = 0; count = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment