Commit cb52fce1 authored by simran singhal's avatar simran singhal Committed by Greg Kroah-Hartman

staging: comedi: amplc_pci224: Convert macro GAT_CONFIG to static inline function

Convert macro GAT_CONFIG to static inline function as static inline
functions are preferred over macros. This change is possible since the
arguments at all call sites have the same type.

The uses were updated with Coccinelle:

@r1@
expression dev,reg,chan,src;
@@
-GAT_CONFIG(chan, src)
+pci224_gat_config(chan, src)

Also, the comment describing the macro has been removed.
Signed-off-by: default avatarsimran singhal <singhalsimran0@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06cb6b54
...@@ -216,8 +216,12 @@ ...@@ -216,8 +216,12 @@
#define GAT_GND 1 /* GND (i.e. disabled) */ #define GAT_GND 1 /* GND (i.e. disabled) */
#define GAT_EXT 2 /* reserved (external gate input) */ #define GAT_EXT 2 /* reserved (external gate input) */
#define GAT_NOUTNM2 3 /* inverted output of channel-2 modulo total */ #define GAT_NOUTNM2 3 /* inverted output of channel-2 modulo total */
/* Macro to construct gate input configuration register value. */
#define GAT_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) static inline unsigned int pci224_gat_config(unsigned int chan,
unsigned int src)
{
return ((chan & 3) << 3) | (src & 7);
}
/* /*
* Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI224 and PCI234: * Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI224 and PCI234:
...@@ -817,10 +821,10 @@ static void pci224_ao_start_pacer(struct comedi_device *dev, ...@@ -817,10 +821,10 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
* source. * source.
*/ */
/* Make sure Z2-0 is gated on. */ /* Make sure Z2-0 is gated on. */
outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); outb(pci224_gat_config(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
/* Cascading with Z2-2. */ /* Cascading with Z2-2. */
/* Make sure Z2-2 is gated on. */ /* Make sure Z2-2 is gated on. */
outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); outb(pci224_gat_config(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
/* Z2-2 needs 10 MHz clock. */ /* Z2-2 needs 10 MHz clock. */
outb(CLK_CONFIG(2, CLK_10MHZ), devpriv->iobase1 + PCI224_ZCLK_SCE); outb(CLK_CONFIG(2, CLK_10MHZ), devpriv->iobase1 + PCI224_ZCLK_SCE);
/* Z2-0 is clocked from Z2-2's output. */ /* Z2-0 is clocked from Z2-2's output. */
......
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