[PATCH 14/14] Staging: comedi: fixes parenthesis errors in adl_pci9111.c

[PATCH 14/14] Staging: comedi: fixes parenthesis errors in adl_pci9111.c

[Maurice Dawson]

Patch to the adl_pci9111.c file that fixes ERROR: Macros with complex values should be enclosed in parenthesis

Signed-off-by: Maurice Dawson <mauricedawson2699@googlemail.com>
---
 drivers/staging/comedi/drivers/adl_pci9111.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index bf47f79..5e6f72f 100755
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -181,7 +181,7 @@ Add external multiplexer support.
 #define PCI9111_FIFO_FULL_MASK				0x40
 #define PCI9111_AD_BUSY_MASK				0x80
 
-#define PCI9111_IO_BASE dev->iobase
+#define PCI9111_IO_BASE (dev->iobase)
 
 /*
  * Define inlined function
@@ -231,22 +231,24 @@ Add external multiplexer support.
     PCI9111_IO_BASE+PCI9111_REGISTER_AD_CHANNEL_CONTROL)
 
 #define pci9111_ai_channel_get() \
-  inb(PCI9111_IO_BASE+PCI9111_REGISTER_AD_CHANNEL_READBACK)&PCI9111_CHANNEL_MASK
+  inb((PCI9111_IO_BASE+PCI9111_REGISTER_AD_CHANNEL_READBACK)& \
+							PCI9111_CHANNEL_MASK)
 
 #define pci9111_ai_range_set(range) \
   outb((range)&PCI9111_RANGE_MASK, \
     PCI9111_IO_BASE+PCI9111_REGISTER_INPUT_SIGNAL_RANGE)
 
 #define pci9111_ai_range_get() \
-  inb(PCI9111_IO_BASE+PCI9111_REGISTER_RANGE_STATUS_READBACK)&PCI9111_RANGE_MASK
+  inb((PCI9111_IO_BASE+PCI9111_REGISTER_RANGE_STATUS_READBACK)& \
+							PCI9111_RANGE_MASK)
 
 #define pci9111_ai_get_data() \
-  ((inw(PCI9111_IO_BASE+PCI9111_REGISTER_AD_FIFO_VALUE)>>4) \
-    &PCI9111_AI_RESOLUTION_MASK) ^ PCI9111_AI_RESOLUTION_2_CMP_BIT
+  (((inw(PCI9111_IO_BASE+PCI9111_REGISTER_AD_FIFO_VALUE)>>4) \
+    &PCI9111_AI_RESOLUTION_MASK) ^ PCI9111_AI_RESOLUTION_2_CMP_BIT)
 
 #define pci9111_hr_ai_get_data() \
-  (inw(PCI9111_IO_BASE+PCI9111_REGISTER_AD_FIFO_VALUE) \
-    &PCI9111_HR_AI_RESOLUTION_MASK) ^ PCI9111_HR_AI_RESOLUTION_2_CMP_BIT
+  ((inw(PCI9111_IO_BASE+PCI9111_REGISTER_AD_FIFO_VALUE) \
+    &PCI9111_HR_AI_RESOLUTION_MASK) ^ PCI9111_HR_AI_RESOLUTION_2_CMP_BIT)
 
 #define pci9111_ao_set_data(data) \
   outw(data&PCI9111_AO_RESOLUTION_MASK, \
-- 
1.6.3.3

Re: [PATCH 14/14] Staging: comedi: fixes parenthesis errors in adl_pci9111.c

[Greg KH]

On Tue, Mar 09, 2010 at 08:49:45PM +0000, Maurice Dawson wrote:
> Patch to the adl_pci9111.c file that fixes ERROR: Macros with complex values should be enclosed in parenthesis

Doesn't apply :(