Skip to contentSkip to conversation

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

PATCH Superseded simran singhal 2 participants 3 messages Mar 10, 2017 – Mar 12, 2017 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

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.

---
 drivers/staging/comedi/drivers/amplc_pci224.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +10 -4
index 2e6decf..46026f5 100644
@@ -216,8 +216,12 @@
 #define GAT_GND		1	/* GND (i.e. disabled) */
 #define GAT_EXT		2	/* reserved (external gate input) */
 #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 PCI224 and PCI234:
@@ -817,10 +821,12 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
 	 * source.
 	 */
 	/* Make sure Z2-0 is gated on.  */
-	outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+	outb(pci230_gat_config(0, GAT_VCC),
+	     devpriv->iobase1 + PCI224_ZGAT_SCE);
 	/* Cascading with Z2-2. */
 	/* Make sure Z2-2 is gated on.  */
-	outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+	outb(pci230_gat_config(2, GAT_VCC),
+	     devpriv->iobase1 + PCI224_ZGAT_SCE);
 	/* Z2-2 needs 10 MHz clock. */
 	outb(CLK_CONFIG(2, CLK_10MHZ), devpriv->iobase1 + PCI224_ZCLK_SCE);
 	/* Z2-0 is clocked from Z2-2's output. */
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 4 lines · simran singhal

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.

Quoted 8 lines

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)

Where did you get the name from?

Quoted 37 lines
drivers/staging/comedi/drivers/amplc_pci224.c +3 -0
+{
+       return ((chan & 3) << 3) | (src & 7);
+}

@r1@
expression dev,reg,chan,src;
@@

(quoted diff) +1 -1
-GAT_CONFIG(chan, src)
+pci230_gat_config(chan, src)

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

---
 drivers/staging/comedi/drivers/amplc_pci224.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +6 -2
index 2e6decf..46026f5 100644
@@ -216,8 +216,12 @@
 #define GAT_GND		1	/* GND (i.e. disabled) */
 #define GAT_EXT		2	/* reserved (external gate input) */
 #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 PCI224 and PCI234:

drivers/staging/comedi/drivers/amplc_pci224.c static void pci224_ao_start_pacer(struct comedi_device *dev, · line 825

Quoted 6 lines
drivers/staging/comedi/drivers/amplc_pci224.c +2 -1
@@ -817,10 +821,12 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
 	 * source.
 	 */
 	/* Make sure Z2-0 is gated on.  */
-	outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+	outb(pci230_gat_config(0, GAT_VCC),
+	     devpriv->iobase1 + PCI224_ZGAT_SCE);

Why put this on 2 lines?

drivers/staging/comedi/drivers/amplc_pci224.c static void pci224_ao_start_pacer(struct comedi_device *dev, · line 829

Quoted 5 lines
drivers/staging/comedi/drivers/amplc_pci224.c +2 -1
 	/* Cascading with Z2-2. */
 	/* Make sure Z2-2 is gated on.  */
-	outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+	outb(pci230_gat_config(2, GAT_VCC),
+	     devpriv->iobase1 + PCI224_ZGAT_SCE);

Same here?

thanks,

greg k-h

#2 lore raw
Quoted 7 lines · Greg KH
Quoted 6 lines · simran singhal

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:

Quoted 9 lines
Quoted 6 lines

@r@
expression e;
@@
- #define GAT_CONFIG(chan, src) e
+ static inline unsigned int pci230_gat_config(unsigned int chan,
+ unsigned int src)

Where did you get the name from?

Actually the name should be pci224_gat_config as when I checked the other drivers like amplc_pci230.c then its using pci230_gat_config so according to what other drivers are using I should use pci224_gat_config.

I will correct this and will resend it.

Quoted 34 lines
Quoted 34 lines
drivers/staging/comedi/drivers/amplc_pci224.c +3 -0
+{
+       return ((chan & 3) << 3) | (src & 7);
+}

@r1@
expression dev,reg,chan,src;
@@

(quoted diff) +1 -1
-GAT_CONFIG(chan, src)
+pci230_gat_config(chan, src)

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

---
 drivers/staging/comedi/drivers/amplc_pci224.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +6 -2
index 2e6decf..46026f5 100644
@@ -216,8 +216,12 @@
 #define GAT_GND              1       /* GND (i.e. disabled) */
 #define GAT_EXT              2       /* reserved (external gate input) */
 #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);
+}
 
Quoted 11 lines

drivers/staging/comedi/drivers/amplc_pci224.c static void pci224_ao_start_pacer(struct comedi_device *dev, · line 825

Quoted 9 lines
drivers/staging/comedi/drivers/amplc_pci224.c +2 -1
 /*
  * Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI224 and PCI234:
@@ -817,10 +821,12 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
       * source.
       */
      /* Make sure Z2-0 is gated on.  */
-     outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+     outb(pci230_gat_config(0, GAT_VCC),
+          devpriv->iobase1 + PCI224_ZGAT_SCE);

Why put this on 2 lines?

I'll check this again and if their will be no problem in putting this on one line then
I'll resend it with the change.

Quoted 12 lines

drivers/staging/comedi/drivers/amplc_pci224.c static void pci224_ao_start_pacer(struct comedi_device *dev, · line 829

Quoted 6 lines
drivers/staging/comedi/drivers/amplc_pci224.c +2 -1
      /* Cascading with Z2-2. */
      /* Make sure Z2-2 is gated on.  */
-     outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE);
+     outb(pci230_gat_config(2, GAT_VCC),
+          devpriv->iobase1 + PCI224_ZGAT_SCE);

Same here?

thanks,

greg k-h