1 files changed, 24 insertions, 27 deletions

diff --git a/cts/i2c/dut.c b/cts/i2c/dut.c
index 98805a4fc2..e4a87f440e 100644
--- a/cts/i2c/dut.c
+++ b/cts/i2c/dut.c
@@ -17,66 +17,63 @@
 
 enum cts_rc write8_test(void)
 {
-	int port = i2c_ports[0].port;
-
-	i2c_write8(port, TH_ADDR, WRITE_8_OFFSET, WRITE_8_DATA);
-
+	if (i2c_write8(i2c_ports[0].port, TH_ADDR, WRITE8_OFF, WRITE8_DATA))
+		return CTS_RC_FAILURE;
 	return CTS_RC_SUCCESS;
 }
 
 enum cts_rc write16_test(void)
 {
-	int port = i2c_ports[0].port;
-
-	i2c_write16(port, TH_ADDR, WRITE_16_OFFSET, WRITE_16_DATA);
-
+	if (i2c_write16(i2c_ports[0].port, TH_ADDR, WRITE16_OFF, WRITE16_DATA))
+		return CTS_RC_FAILURE;
 	return CTS_RC_SUCCESS;
 }
 
 enum cts_rc write32_test(void)
 {
-	int port = i2c_ports[0].port;
-
-	i2c_write32(port, TH_ADDR, WRITE_32_OFFSET, WRITE_32_DATA);
-
+	if (i2c_write32(i2c_ports[0].port, TH_ADDR, WRITE32_OFF, WRITE32_DATA))
+		return CTS_RC_FAILURE;
 	return CTS_RC_SUCCESS;
 }
 
 enum cts_rc read8_test(void)
 {
-	int result;
-	int port = i2c_ports[0].port;
-
-	i2c_read8(port, TH_ADDR, READ_8_OFFSET, &result);
+	int data;
 
-	if (result != READ_8_DATA)
+	if (i2c_read8(i2c_ports[0].port, TH_ADDR, READ8_OFF, &data))
 		return CTS_RC_FAILURE;
+	if (data != READ8_DATA) {
+		CPRINTL("Expecting 0x%x but read 0x%x", READ8_DATA, data);
+		return CTS_RC_FAILURE;
+	}
 
 	return CTS_RC_SUCCESS;
 }
 
 enum cts_rc read16_test(void)
 {
-	int result;
-	int port = i2c_ports[0].port;
-
-	i2c_read16(port, TH_ADDR, READ_16_OFFSET, &result);
+	int data;
 
-	if (result != READ_16_DATA)
+	if (i2c_read16(i2c_ports[0].port, TH_ADDR, READ16_OFF, &data))
 		return CTS_RC_FAILURE;
+	if (data != READ16_DATA) {
+		CPRINTL("Expecting 0x%x but read 0x%x", READ16_DATA, data);
+		return CTS_RC_FAILURE;
+	}
 
 	return CTS_RC_SUCCESS;
 }
 
 enum cts_rc read32_test(void)
 {
-	int result;
-	int port = i2c_ports[0].port;
-
-	i2c_read32(port, TH_ADDR, READ_32_OFFSET, &result);
+	int data;
 
-	if (result != READ_32_DATA)
+	if (i2c_read32(i2c_ports[0].port, TH_ADDR, READ32_OFF, &data))
+		return CTS_RC_FAILURE;
+	if (data != READ32_DATA) {
+		CPRINTL("Read 0x%x expecting 0x%x", data, READ32_DATA);
 		return CTS_RC_FAILURE;
+	}
 
 	return CTS_RC_SUCCESS;
 }