staging: comedi: amplc_pci230: 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.

This was done using Coccinelle:

@r@
expression e;
@@
- #define GAT_CONFIG(chan, src) e
+ static inline unsigned int pci230_gat_config(unsigned int chan,
+                                              unsigned int src)
+{
+       return ((chan & 3) << 3) | (src & 7);
+}

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

Also, the comment describing the macro has been removed manually.

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 907c39cc89d7115b66869a9d5224565cef4b8ed9..cf5ac8aad236f984157442c93753c1a7f08eeda4 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -379,8 +379,12 @@
 #define GAT_GND                1       /* GND (i.e. disabled) */
 #define GAT_EXT                2       /* external gate input (PPCn on PCI230) */
 #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 pci230_gat_config(unsigned int chan,
+                                            unsigned int src)
+{
+       return ((chan & 3) << 3) | (src & 7);
+}
 
 /*
  * Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI230 and PCI260:
@@ -1263,7 +1267,8 @@ static void pci230_ao_start(struct comedi_device *dev,
                                               irqflags);
                }
                /* Set CT1 gate high to start counting. */
-               outb(GAT_CONFIG(1, GAT_VCC), dev->iobase + PCI230_ZGAT_SCE);
+               outb(pci230_gat_config(1, GAT_VCC),
+                    dev->iobase + PCI230_ZGAT_SCE);
                break;
        case TRIG_INT:
                async->inttrig = pci230_ao_inttrig_scan_begin;
@@ -1351,7 +1356,8 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 * cmd->scan_begin_arg is sampling period in ns.
                 * Gate it off for now.
                 */
-               outb(GAT_CONFIG(1, GAT_GND), dev->iobase + PCI230_ZGAT_SCE);
+               outb(pci230_gat_config(1, GAT_GND),
+                    dev->iobase + PCI230_ZGAT_SCE);
                pci230_ct_setup_ns_mode(dev, 1, I8254_MODE3,
                                        cmd->scan_begin_arg,
                                        cmd->flags);
@@ -1792,9 +1798,9 @@ static int pci230_ai_inttrig_scan_begin(struct comedi_device *dev,
        spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags);
        if (devpriv->ai_cmd_started) {
                /* Trigger scan by waggling CT0 gate source. */
-               zgat = GAT_CONFIG(0, GAT_GND);
+               zgat = pci230_gat_config(0, GAT_GND);
                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
-               zgat = GAT_CONFIG(0, GAT_VCC);
+               zgat = pci230_gat_config(0, GAT_VCC);
                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
        }
        spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags);
@@ -1926,20 +1932,20 @@ static void pci230_ai_start(struct comedi_device *dev,
                         * Conversion timer CT2 needs to be gated by
                         * inverted output of monostable CT2.
                         */
-                       zgat = GAT_CONFIG(2, GAT_NOUTNM2);
+                       zgat = pci230_gat_config(2, GAT_NOUTNM2);
                } else {
                        /*
                         * Conversion timer CT2 needs to be gated on
                         * continuously.
                         */
-                       zgat = GAT_CONFIG(2, GAT_VCC);
+                       zgat = pci230_gat_config(2, GAT_VCC);
                }
                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
                if (cmd->scan_begin_src != TRIG_FOLLOW) {
                        /* Set monostable CT0 trigger source. */
                        switch (cmd->scan_begin_src) {
                        default:
-                               zgat = GAT_CONFIG(0, GAT_VCC);
+                               zgat = pci230_gat_config(0, GAT_VCC);
                                break;
                        case TRIG_EXT:
                                /*
@@ -1950,21 +1956,21 @@ static void pci230_ai_start(struct comedi_device *dev,
                                 * input in order to use it as an external scan
                                 * trigger.
                                 */
-                               zgat = GAT_CONFIG(0, GAT_EXT);
+                               zgat = pci230_gat_config(0, GAT_EXT);
                                break;
                        case TRIG_TIMER:
                                /*
                                 * Monostable CT0 triggered by rising edge on
                                 * inverted output of CT1 (falling edge on CT1).
                                 */
-                               zgat = GAT_CONFIG(0, GAT_NOUTNM2);
+                               zgat = pci230_gat_config(0, GAT_NOUTNM2);
                                break;
                        case TRIG_INT:
                                /*
                                 * Monostable CT0 is triggered by inttrig
                                 * function waggling the CT0 gate source.
                                 */
-                               zgat = GAT_CONFIG(0, GAT_VCC);
+                               zgat = pci230_gat_config(0, GAT_VCC);
                                break;
                        }
                        outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
@@ -1974,7 +1980,7 @@ static void pci230_ai_start(struct comedi_device *dev,
                                 * Scan period timer CT1 needs to be
                                 * gated on to start counting.
                                 */
-                               zgat = GAT_CONFIG(1, GAT_VCC);
+                               zgat = pci230_gat_config(1, GAT_VCC);
                                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
                                break;
                        case TRIG_INT:
@@ -2216,7 +2222,7 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 * Note, counter/timer output 2 can be monitored on the
                 * connector: PCI230 pin 21, PCI260 pin 18.
                 */
-               zgat = GAT_CONFIG(2, GAT_GND);
+               zgat = pci230_gat_config(2, GAT_GND);
                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
                /* Set counter/timer 2 to the specified conversion period. */
                pci230_ct_setup_ns_mode(dev, 2, I8254_MODE3, cmd->convert_arg,
@@ -2234,7 +2240,7 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                         * monostable to stop it triggering.  The trigger
                         * source will be changed later.
                         */
-                       zgat = GAT_CONFIG(0, GAT_VCC);
+                       zgat = pci230_gat_config(0, GAT_VCC);
                        outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
                        pci230_ct_setup_ns_mode(dev, 0, I8254_MODE1,
                                                ((uint64_t)cmd->convert_arg *
@@ -2247,7 +2253,7 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                                 *
                                 * Set up CT1 but gate it off for now.
                                 */
-                               zgat = GAT_CONFIG(1, GAT_GND);
+                               zgat = pci230_gat_config(1, GAT_GND);
                                outb(zgat, dev->iobase + PCI230_ZGAT_SCE);
                                pci230_ct_setup_ns_mode(dev, 1, I8254_MODE3,
                                                        cmd->scan_begin_arg,