cleanup: refactor CPRINTF("[%T ...]\n") to CPRINTS

Looking at where the non-standard %T printf modifier is used in EC
codebase, the majority is cases where CPRINTS could have been used
instead of CPRINTF. This is a somewhat-mechanical refactor of these
cases, which will make implementing a standard printf easier.

BUG=chromium:984041
BRANCH=none
TEST=buildall

Change-Id: I75ea0be261bfbfa50fb850a0a37fe2ca6ab67cb9
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1703128
Reviewed-by: Evan Green <evgreen@chromium.org>

4 files changed, 14 insertions, 15 deletions

diff --git a/driver/accel_lis2dh.c b/driver/accel_lis2dh.c
index 771128c4f8..9c982d9ac0 100644
--- a/driver/accel_lis2dh.c
+++ b/driver/accel_lis2dh.c
@@ -21,6 +21,7 @@
 #include "driver/stm_mems_common.h"
 
 #define CPUTS(outstr) cputs(CC_ACCEL, outstr)
+#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args)
 
 /**
@@ -123,7 +124,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready)
 
 	ret = st_raw_read8(s->port, s->addr, LIS2DH_STATUS_REG, &tmp);
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type);
+		CPRINTS("%s type:0x%X RS Error", s->name, s->type);
 		return ret;
 	}
 
@@ -156,8 +157,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v)
 	ret = st_raw_read_n(s->port, s->addr, LIS2DH_OUT_X_L_ADDR, raw,
 			 OUT_XYZ_SIZE);
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RD XYZ Error]",
-			s->name, s->type);
+		CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type);
 		return ret;
 	}
 
@@ -241,7 +241,7 @@ static int init(const struct motion_sensor_t *s)
 
 err_unlock:
 	mutex_unlock(s->mutex);
-	CPRINTF("[%T %s: MS Init type:0x%X Error]\n", s->name, s->type);
+	CPRINTS("%s: MS Init type:0x%X Error", s->name, s->type);
 
 	return ret;
 }
diff --git a/driver/accelgyro_lsm6ds0.c b/driver/accelgyro_lsm6ds0.c
index 5f1b66717a..664fcc7e88 100644
--- a/driver/accelgyro_lsm6ds0.c
+++ b/driver/accelgyro_lsm6ds0.c
@@ -19,6 +19,7 @@
 #include "util.h"
 
 #define CPUTS(outstr) cputs(CC_ACCEL, outstr)
+#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args)
 
 /*
@@ -306,7 +307,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready)
 	ret = raw_read8(s->port, s->addr, LSM6DS0_STATUS_REG, &tmp);
 
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type);
+		CPRINTS("%s type:0x%X RS Error", s->name, s->type);
 		return ret;
 	}
 
@@ -346,7 +347,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v)
 	ret = i2c_read_block(s->port, s->addr, xyz_reg, raw, 6);
 
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RD XYZ Error]",
+		CPRINTS("%s type:0x%X RD XYZ Error",
 			s->name, s->type);
 		return ret;
 	}
diff --git a/driver/accelgyro_lsm6dsm.c b/driver/accelgyro_lsm6dsm.c
index e5166eccc9..b4ba92a0e8 100644
--- a/driver/accelgyro_lsm6dsm.c
+++ b/driver/accelgyro_lsm6dsm.c
@@ -284,7 +284,7 @@ static int fifo_next(struct lsm6dsm_data *private)
 		 * Not expected we are supposed to be called to process FIFO
 		 * data.
 		 */
-		CPRINTF("[%T FIFO empty pattern]\n");
+		CPRINTS("FIFO empty pattern");
 		return FIFO_DEV_INVALID;
 	}
 
@@ -477,10 +477,8 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event)
 		if (ret != EC_SUCCESS)
 			return ret;
 		last_fifo_read_ts = __hw_clock_source_read();
-		if (fsts.len & (LSM6DSM_FIFO_DATA_OVR | LSM6DSM_FIFO_FULL)) {
-			CPRINTF("[%T %s FIFO Overrun: %04x]\n",
-				s->name, fsts.len);
-		}
+		if (fsts.len & (LSM6DSM_FIFO_DATA_OVR | LSM6DSM_FIFO_FULL))
+			CPRINTS("%s FIFO Overrun: %04x", s->name, fsts.len);
 		if (!IS_FSTS_EMPTY(fsts))
 			ret = load_fifo(s, &fsts, &last_fifo_read_ts);
 
@@ -655,7 +653,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready)
 
 	ret = st_raw_read8(s->port, s->addr, LSM6DSM_STATUS_REG, &tmp);
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type);
+		CPRINTS("%s type:0x%X RS Error", s->name, s->type);
 		return ret;
 	}
 
diff --git a/driver/gyro_l3gd20h.c b/driver/gyro_l3gd20h.c
index 44ee89c9a3..4fcaf15ed0 100644
--- a/driver/gyro_l3gd20h.c
+++ b/driver/gyro_l3gd20h.c
@@ -17,6 +17,7 @@
 #include "util.h"
 
 #define CPUTS(outstr) cputs(CC_ACCEL, outstr)
+#define CPRINTS(format, args...) cprints(CC_ACCEL, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_ACCEL, format, ## args)
 
 /*
@@ -301,7 +302,7 @@ static int is_data_ready(const struct motion_sensor_t *s, int *ready)
 	ret = raw_read8(s->port, s->addr, L3GD20_STATUS_REG, &tmp);
 
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RS Error]", s->name, s->type);
+		CPRINTS("%s type:0x%X RS Error", s->name, s->type);
 		return ret;
 	}
 
@@ -338,8 +339,7 @@ static int read(const struct motion_sensor_t *s, intv3_t v)
 	i2c_block_read(s->port, s->addr, xyz_reg, raw, 6);
 
 	if (ret != EC_SUCCESS) {
-		CPRINTF("[%T %s type:0x%X RD XYZ Error]",
-			s->name, s->type);
+		CPRINTS("%s type:0x%X RD XYZ Error", s->name, s->type);
 		return ret;
 	}