From 74a93fb53d537daa50cfb6c94a4a55f4285474fa Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 3 Sep 2003 11:14:04 -0700 Subject: [PATCH] [PATCH] hermes.h fails with outw_p() in :? From: Michael Pruznick 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. --- drivers/net/wireless/hermes.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h index b43fa0cf39402..b29e42a146f18 100644 --- 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); -- 2.53.0