From: Dirk Eibach <dirk.eibach@gdsys.cc>
Date: Wed, 28 Oct 2015 10:46:23 +0000 (+0100)
Subject: i2c: ihs_i2c: Use macro bestpractices
X-Git-Tag: v2016.01-rc1~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3af0cdb137b5a94751913467615d7e961271a69c;p=oweals%2Fu-boot.git

i2c: ihs_i2c: Use macro bestpractices

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

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Acked-by: Heiko Schocher <hs@denx.de>
---

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 737beaf218..e0014590b5 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 {