From: Corey Minyard <email address hidden>
Macro parameters should almost always have () around them when used. llvm reported an error on this.
Remove redundant parenthesis and put parenthesis around the entire macros with assignments in case they are used in an expression.
Remove some unused macros.
Reported in https://bugs.launchpad.net/bugs/1651167
Signed-off-by: Corey Minyard <email address hidden> Reviewed-by: Eric Blake <email address hidden> --- hw/ipmi/isa_ipmi_bt.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-)
Changed in v3: * Add Eric's reviewed-by. Thanks!
Changes in v2: * Put parenthesis around macros that had assignment in them. * Removed some redundant parenthesis. * Removed some macros that were not used.
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index f036617..68bf5cd 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -37,40 +37,30 @@ #define IPMI_BT_HBUSY_BIT 6 #define IPMI_BT_BBUSY_BIT 7
-#define IPMI_BT_CLR_WR_MASK (1 << IPMI_BT_CLR_WR_BIT) #define IPMI_BT_GET_CLR_WR(d) (((d) >> IPMI_BT_CLR_WR_BIT) & 0x1) -#define IPMI_BT_SET_CLR_WR(d, v) (d) = (((d) & ~IPMI_BT_CLR_WR_MASK) | \ - (((v & 1) << IPMI_BT_CLR_WR_BIT)))
-#define IPMI_BT_CLR_RD_MASK (1 << IPMI_BT_CLR_RD_BIT) #define IPMI_BT_GET_CLR_RD(d) (((d) >> IPMI_BT_CLR_RD_BIT) & 0x1) -#define IPMI_BT_SET_CLR_RD(d, v) (d) = (((d) & ~IPMI_BT_CLR_RD_MASK) | \ - (((v & 1) << IPMI_BT_CLR_RD_BIT)))
-#define IPMI_BT_H2B_ATN_MASK (1 << IPMI_BT_H2B_ATN_BIT) #define IPMI_BT_GET_H2B_ATN(d) (((d) >> IPMI_BT_H2B_ATN_BIT) & 0x1) -#define IPMI_BT_SET_H2B_ATN(d, v) (d) = (((d) & ~IPMI_BT_H2B_ATN_MASK) | \ - (((v & 1) << IPMI_BT_H2B_ATN_BIT)))
#define IPMI_BT_B2H_ATN_MASK (1 << IPMI_BT_B2H_ATN_BIT) #define IPMI_BT_GET_B2H_ATN(d) (((d) >> IPMI_BT_B2H_ATN_BIT) & 0x1) -#define IPMI_BT_SET_B2H_ATN(d, v) (d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ - (((v & 1) << IPMI_BT_B2H_ATN_BIT))) +#define IPMI_BT_SET_B2H_ATN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_ATN_MASK) | \ + (((v) & 1) << IPMI_BT_B2H_ATN_BIT)))
#define IPMI_BT_SMS_ATN_MASK (1 << IPMI_BT_SMS_ATN_BIT) #define IPMI_BT_GET_SMS_ATN(d) (((d) >> IPMI_BT_SMS_ATN_BIT) & 0x1) -#define IPMI_BT_SET_SMS_ATN(d, v) (d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ - (((v & 1) << IPMI_BT_SMS_ATN_BIT))) +#define IPMI_BT_SET_SMS_ATN(d, v) ((d) = (((d) & ~IPMI_BT_SMS_ATN_MASK) | \ + (((v) & 1) << IPMI_BT_SMS_ATN_BIT)))
#define IPMI_BT_HBUSY_MASK (1 << IPMI_BT_HBUSY_BIT) #define IPMI_BT_GET_HBUSY(d) (((d) >> IPMI_BT_HBUSY_BIT) & 0x1) -#define IPMI_BT_SET_HBUSY(d, v) (d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ - (((v & 1) << IPMI_BT_HBUSY_BIT))) +#define IPMI_BT_SET_HBUSY(d, v) ((d) = (((d) & ~IPMI_BT_HBUSY_MASK) | \ + (((v) & 1) << IPMI_BT_HBUSY_BIT)))
#define IPMI_BT_BBUSY_MASK (1 << IPMI_BT_BBUSY_BIT) -#define IPMI_BT_GET_BBUSY(d) (((d) >> IPMI_BT_BBUSY_BIT) & 0x1) -#define IPMI_BT_SET_BBUSY(d, v) (d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ - (((v & 1) << IPMI_BT_BBUSY_BIT))) +#define IPMI_BT_SET_BBUSY(d, v) ((d) = (((d) & ~IPMI_BT_BBUSY_MASK) | \ + (((v) & 1) << IPMI_BT_BBUSY_BIT)))
/* Mask register */ @@ -79,13 +69,13 @@
#define IPMI_BT_B2H_IRQ_EN_MASK (1 << IPMI_BT_B2H_IRQ_EN_BIT) #define IPMI_BT_GET_B2H_IRQ_EN(d) (((d) >> IPMI_BT_B2H_IRQ_EN_BIT) & 0x1) -#define IPMI_BT_SET_B2H_IRQ_EN(d, v) (d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) | \ - (((v & 1) << IPMI_BT_B2H_IRQ_EN_BIT))) +#define IPMI_BT_SET_B2H_IRQ_EN(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_EN_MASK) |\ + (((v) & 1) << IPMI_BT_B2H_IRQ_EN_BIT)))
#define IPMI_BT_B2H_IRQ_MASK (1 << IPMI_BT_B2H_IRQ_BIT) #define IPMI_BT_GET_B2H_IRQ(d) (((d) >> IPMI_BT_B2H_IRQ_BIT) & 0x1) -#define IPMI_BT_SET_B2H_IRQ(d, v) (d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ - (((v & 1) << IPMI_BT_B2H_IRQ_BIT))) +#define IPMI_BT_SET_B2H_IRQ(d, v) ((d) = (((d) & ~IPMI_BT_B2H_IRQ_MASK) | \ + (((v) & 1) << IPMI_BT_B2H_IRQ_BIT)))
typedef struct IPMIBT { IPMIBmc *bmc; -- 2.7.4
From: Corey Minyard <email address hidden>
Macro parameters should almost always have () around them when used.
llvm reported an error on this.
Remove redundant parenthesis and put parenthesis around the entire
macros with assignments in case they are used in an expression.
Remove some unused macros.
Reported in https:/ /bugs.launchpad .net/bugs/ 1651167
Signed-off-by: Corey Minyard <email address hidden> isa_ipmi_ bt.c | 34 +++++++ +++++-- ------- ------- ------
Reviewed-by: Eric Blake <email address hidden>
---
hw/ipmi/
1 file changed, 12 insertions(+), 22 deletions(-)
Changed in v3:
* Add Eric's reviewed-by. Thanks!
Changes in v2:
* Put parenthesis around macros that had assignment in them.
* Removed some redundant parenthesis.
* Removed some macros that were not used.
diff --git a/hw/ipmi/ isa_ipmi_ bt.c b/hw/ipmi/ isa_ipmi_ bt.c isa_ipmi_ bt.c isa_ipmi_ bt.c
index f036617..68bf5cd 100644
--- a/hw/ipmi/
+++ b/hw/ipmi/
@@ -37,40 +37,30 @@
#define IPMI_BT_HBUSY_BIT 6
#define IPMI_BT_BBUSY_BIT 7
-#define IPMI_BT_CLR_WR_MASK (1 << IPMI_BT_CLR_WR_BIT) GET_CLR_ WR(d) (((d) >> IPMI_BT_CLR_WR_BIT) & 0x1) SET_CLR_ WR(d, v) (d) = (((d) & ~IPMI_BT_ CLR_WR_ MASK) | \ CLR_WR_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
-#define IPMI_BT_CLR_RD_MASK (1 << IPMI_BT_CLR_RD_BIT) GET_CLR_ RD(d) (((d) >> IPMI_BT_CLR_RD_BIT) & 0x1) SET_CLR_ RD(d, v) (d) = (((d) & ~IPMI_BT_ CLR_RD_ MASK) | \ CLR_RD_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
-#define IPMI_BT_ H2B_ATN_ MASK (1 << IPMI_BT_ H2B_ATN_ BIT) GET_H2B_ ATN(d) (((d) >> IPMI_BT_ H2B_ATN_ BIT) & 0x1) SET_H2B_ ATN(d, v) (d) = (((d) & ~IPMI_BT_ H2B_ATN_ MASK) | \ H2B_ATN_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
#define IPMI_BT_ B2H_ATN_ MASK (1 << IPMI_BT_ B2H_ATN_ BIT) GET_B2H_ ATN(d) (((d) >> IPMI_BT_ B2H_ATN_ BIT) & 0x1) SET_B2H_ ATN(d, v) (d) = (((d) & ~IPMI_BT_ B2H_ATN_ MASK) | \ B2H_ATN_ BIT))) SET_B2H_ ATN(d, v) ((d) = (((d) & ~IPMI_BT_ B2H_ATN_ MASK) | \ B2H_ATN_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
#define IPMI_BT_ SMS_ATN_ MASK (1 << IPMI_BT_ SMS_ATN_ BIT) GET_SMS_ ATN(d) (((d) >> IPMI_BT_ SMS_ATN_ BIT) & 0x1) SET_SMS_ ATN(d, v) (d) = (((d) & ~IPMI_BT_ SMS_ATN_ MASK) | \ SMS_ATN_ BIT))) SET_SMS_ ATN(d, v) ((d) = (((d) & ~IPMI_BT_ SMS_ATN_ MASK) | \ SMS_ATN_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
#define IPMI_BT_HBUSY_MASK (1 << IPMI_BT_HBUSY_BIT) GET_HBUSY( d) (((d) >> IPMI_BT_HBUSY_BIT) & 0x1) SET_HBUSY( d, v) (d) = (((d) & ~IPMI_BT_ HBUSY_MASK) | \ HBUSY_BIT) )) SET_HBUSY( d, v) ((d) = (((d) & ~IPMI_BT_ HBUSY_MASK) | \ HBUSY_BIT) ))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
#define IPMI_BT_BBUSY_MASK (1 << IPMI_BT_BBUSY_BIT) GET_BBUSY( d) (((d) >> IPMI_BT_BBUSY_BIT) & 0x1) SET_BBUSY( d, v) (d) = (((d) & ~IPMI_BT_ BBUSY_MASK) | \ BBUSY_BIT) )) SET_BBUSY( d, v) ((d) = (((d) & ~IPMI_BT_ BBUSY_MASK) | \ BBUSY_BIT) ))
-#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
/* Mask register */
@@ -79,13 +69,13 @@
#define IPMI_BT_ B2H_IRQ_ EN_MASK (1 << IPMI_BT_ B2H_IRQ_ EN_BIT) GET_B2H_ IRQ_EN( d) (((d) >> IPMI_BT_ B2H_IRQ_ EN_BIT) & 0x1) SET_B2H_ IRQ_EN( d, v) (d) = (((d) & ~IPMI_BT_ B2H_IRQ_ EN_MASK) | \ B2H_IRQ_ EN_BIT) )) SET_B2H_ IRQ_EN( d, v) ((d) = (((d) & ~IPMI_BT_ B2H_IRQ_ EN_MASK) |\ B2H_IRQ_ EN_BIT) ))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
#define IPMI_BT_ B2H_IRQ_ MASK (1 << IPMI_BT_ B2H_IRQ_ BIT) GET_B2H_ IRQ(d) (((d) >> IPMI_BT_ B2H_IRQ_ BIT) & 0x1) SET_B2H_ IRQ(d, v) (d) = (((d) & ~IPMI_BT_ B2H_IRQ_ MASK) | \ B2H_IRQ_ BIT))) SET_B2H_ IRQ(d, v) ((d) = (((d) & ~IPMI_BT_ B2H_IRQ_ MASK) | \ B2H_IRQ_ BIT)))
#define IPMI_BT_
-#define IPMI_BT_
- (((v & 1) << IPMI_BT_
+#define IPMI_BT_
+ (((v) & 1) << IPMI_BT_
typedef struct IPMIBT {
IPMIBmc *bmc;
--
2.7.4