[U-Boot] [PATCH v1 02/18] i2c: ihs_i2c: Use macro bestpractices

dirk.eibach at gdsys.cc dirk.eibach at gdsys.cc
Wed Oct 28 11:46:23 CET 2015


From: Dirk Eibach <dirk.eibach at gdsys.cc>

Reinhard Pfau complained that macros in ihs_i2c do not follow best practices.

Signed-off-by: Dirk Eibach <dirk.eibach at gdsys.cc>
---

 drivers/i2c/ihs_i2c.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 737beaf..e001459 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -13,24 +13,28 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SYS_I2C_IHS_DUAL
 #define I2C_SET_REG(fld, val) \
-	{ if (I2C_ADAP_HWNR & 0x10) \
-		FPGA_SET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
-	else \
-		FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val); }
+	do { \
+		if (I2C_ADAP_HWNR & 0x10) \
+			FPGA_SET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
+		else \
+			FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val); \
+	} while (0)
 #else
 #define I2C_SET_REG(fld, val) \
-		FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val);
+		FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val)
 #endif
 
 #ifdef CONFIG_SYS_I2C_IHS_DUAL
 #define I2C_GET_REG(fld, val) \
-	{ if (I2C_ADAP_HWNR & 0x10) \
-		FPGA_GET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
-	else \
-		FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val); }
+	do {					\
+		if (I2C_ADAP_HWNR & 0x10) \
+			FPGA_GET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
+		else \
+			FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val); \
+	} while (0)
 #else
 #define I2C_GET_REG(fld, val) \
-		FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val);
+		FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val)
 #endif
 
 enum {
-- 
2.1.3



More information about the U-Boot mailing list