From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 12 Feb 2009 01:36:14 +0000 (-0500)
Subject: i2c.h: drop i2c_reg_{read, write} hack for Blackfin parts
X-Git-Tag: v2009.03-rc1~79^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15208ac9eae1c340c4bc11f70cbf5c9da78a57ba;p=platform%2Fkernel%2Fu-boot.git

i2c.h: drop i2c_reg_{read, write} hack for Blackfin parts

The Blackfin i2c driver has been rewritten thus the special ifdefs in the
common code are no longer needed.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/include/i2c.h b/include/i2c.h
index fad2d57..f8a59a6 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -159,14 +159,7 @@ static inline u8 i2c_reg_read(u8 addr, u8 reg)
 	printf("%s: addr=0x%02x, reg=0x%02x\n", __func__, addr, reg);
 #endif
 
-#ifdef CONFIG_BLACKFIN
-	/* This ifdef will become unneccessary in a future version of the
-	 * blackfin I2C driver.
-	 */
-	i2c_read(addr, reg, 0, &buf, 1);
-#else
 	i2c_read(addr, reg, 1, &buf, 1);
-#endif
 
 	return buf;
 }
@@ -183,14 +176,7 @@ static inline void i2c_reg_write(u8 addr, u8 reg, u8 val)
 	       __func__, addr, reg, val);
 #endif
 
-#ifdef CONFIG_BLACKFIN
-	/* This ifdef will become unneccessary in a future version of the
-	 * blackfin I2C driver.
-	 */
-	i2c_write(addr, reg, 0, &val, 1);
-#else
 	i2c_write(addr, reg, 1, &val, 1);
-#endif
 }
 
 /*