X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Ftsi108_i2c.c;h=3a3b75c39bf4b5606edb298e1057708e73a81a29;hb=991b089d1ce5ad945725e3657a8f106dfa02a38e;hp=c100cb824705e3afacf46af505ec9091983ccfe5;hpb=a41969e09b9d886091a804c2ba5f1ab84b084dd3;p=oweals%2Fu-boot.git

diff --git a/drivers/tsi108_i2c.c b/drivers/tsi108_i2c.c
index c100cb8247..3a3b75c39b 100644
--- a/drivers/tsi108_i2c.c
+++ b/drivers/tsi108_i2c.c
@@ -28,7 +28,7 @@
 #ifdef CONFIG_TSI108_I2C
 #include <tsi108.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_I2C)
+#if defined(CONFIG_CMD_I2C)
 
 #define I2C_DELAY	100000
 #undef  DEBUG_I2C
@@ -82,15 +82,10 @@ static int i2c_read_byte (
 		/* Wait until operation completed */
 		do {
 			/* Read I2C operation status */
-			temp =
-			    *(u32 *) (CFG_TSI108_CSR_BASE + chan_offset +
-				      I2C_CNTRL2);
-
-			if (0 ==
-			    (temp & (I2C_CNTRL2_RD_STATUS | I2C_CNTRL2_START)))
-			{
-				if (0 ==
-				    (temp &
+			temp = *(u32 *) (CFG_TSI108_CSR_BASE + chan_offset + I2C_CNTRL2);
+
+			if (0 == (temp & (I2C_CNTRL2_RD_STATUS | I2C_CNTRL2_START))) {
+				if (0 == (temp &
 				     (I2C_CNTRL2_I2C_CFGERR |
 				      I2C_CNTRL2_I2C_TO_ERR))
 				    ) {
@@ -152,9 +147,7 @@ int i2c_read (uchar chip_addr, uint byte_addr, int alen,
 	/* Check for valid I2C address */
 	if (chip_addr <= 0x7F && (byte_addr + len) <= (0x01 << (alen * 8))) {
 		while (len--) {
-			op_status =
-			    i2c_read_byte(i2c_if, chip_addr, byte_addr++,
-					  buffer++);
+			op_status = i2c_read_byte(i2c_if, chip_addr, byte_addr++, buffer++);
 
 			if (TSI108_I2C_SUCCESS != op_status) {
 				DPRINT (("I2C read_byte() failed: 0x%02x (%d left)\n", op_status, len));
@@ -182,10 +175,7 @@ static int i2c_write_byte (uchar chip_addr,/* I2C device address on the bus */
 	/* Check if I2C operation is in progress */
 	temp = *(u32 *) (CFG_TSI108_CSR_BASE + TSI108_I2C_OFFSET + I2C_CNTRL2);
 
-	if (0 ==
-	    (temp &
-	     (I2C_CNTRL2_RD_STATUS | I2C_CNTRL2_WR_STATUS | I2C_CNTRL2_START)))
-	{
+	if (0 == (temp & (I2C_CNTRL2_RD_STATUS | I2C_CNTRL2_WR_STATUS | I2C_CNTRL2_START))) {
 		/* Place data into the I2C Tx Register */
 		*(u32 *) (CFG_TSI108_CSR_BASE + TSI108_I2C_OFFSET +
 			  I2C_TX_DATA) = (u32) * buffer;
@@ -200,7 +190,7 @@ static int i2c_write_byte (uchar chip_addr,/* I2C device address on the bus */
 		/* Issue the write command (at this moment all other parameters
 		 * are 0 (size = 1 byte, lane = 0)
 		 */
-		
+
 		*(u32 *) (CFG_TSI108_CSR_BASE + TSI108_I2C_OFFSET +
 			  I2C_CNTRL2) = (I2C_CNTRL2_START);
 
@@ -209,15 +199,10 @@ static int i2c_write_byte (uchar chip_addr,/* I2C device address on the bus */
 		/* Wait until operation completed */
 		do {
 			/* Read I2C operation status */
-			temp =
-			    *(u32 *) (CFG_TSI108_CSR_BASE + TSI108_I2C_OFFSET +
-				      I2C_CNTRL2);
-
-			if (0 ==
-			    (temp & (I2C_CNTRL2_WR_STATUS | I2C_CNTRL2_START)))
-			{
-				if (0 ==
-				    (temp &
+			temp = *(u32 *) (CFG_TSI108_CSR_BASE + TSI108_I2C_OFFSET + I2C_CNTRL2);
+
+			if (0 == (temp & (I2C_CNTRL2_WR_STATUS | I2C_CNTRL2_START))) {
+				if (0 == (temp &
 				     (I2C_CNTRL2_I2C_CFGERR |
 				      I2C_CNTRL2_I2C_TO_ERR))) {
 					op_status = TSI108_I2C_SUCCESS;
@@ -294,5 +279,5 @@ int i2c_probe (uchar chip)
 	return i2c_read (chip, 0, 1, (char *)&tmp, 1);
 }
 
-#endif	/* (CONFIG_COMMANDS & CFG_CMD_I2C) */
+#endif
 #endif /* CONFIG_TSI108_I2C */