[PATCH] hermes.h fails with outw_p() in :?

From: Michael Pruznick <michael_pruznick@mvista.com>

build errors:
  hermes.h: In function `hermes_set_irqmask':
  hermes.h:337: parse error before "do"
  hermes.h:337: parse error before ';' token
  hermes.h: In function `hermes_write_words':

In mips, outw_p() is a #define do...while(0) which, in the case of ?:,
results in a statement being used where an expression is required.

diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h
index b43fa0cf3940264b6d42fd8323005b00aee96ebf..b29e42a146f18133bfd2c2174d39719688d2d0c1 100644 (file)
--- a/drivers/net/wireless/hermes.h
+++ b/drivers/net/wireless/hermes.h
@@ -302,12 +302,14 @@ typedef struct hermes_response {
 #define hermes_read_reg(hw, off) ((hw)->io_space ? \
        inw((hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
        readw((hw)->iobase + ( (off) << (hw)->reg_spacing )))
-#define hermes_write_reg(hw, off, val) ((hw)->io_space ? \
-       outw_p((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
-       writew((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )))
-
-#define hermes_read_regn(hw, name) (hermes_read_reg((hw), HERMES_##name))
-#define hermes_write_regn(hw, name, val) (hermes_write_reg((hw), HERMES_##name, (val)))
+#define hermes_write_reg(hw, off, val) do { \
+       if ((hw)->io_space) \
+               outw_p((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \
+       else \
+               writew((val), (hw)->iobase + ((off) << (hw)->reg_spacing)); \
+       } while (0)
+#define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)
+#define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
 
 /* Function prototypes */
 void hermes_struct_init(hermes_t *hw, ulong address, int io_space, int reg_spacing);