printf: Fix formatting errors

This change fixes the printf formatting errors found by the
compile-time prinf format checker. The errors fall into a few
categories:

1. Incorrect size specifier (missing or extra l).
2. Missing or extra arguments.
3. Bad line splitting.

BUG=chromium:984041
TEST=make -j buildall
BRANCH=none

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

29 files changed, 51 insertions, 43 deletions

diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c
index 8350f3a060..fe25dec5c9 100644
--- a/baseboard/grunt/baseboard.c
+++ b/baseboard/grunt/baseboard.c
@@ -440,7 +440,7 @@ int board_set_active_charge_port(int port)
 
 	/* Enable requested charge port. */
 	if (ppc_vbus_sink_enable(port, 1)) {
-		CPRINTS("p%d: sink enable failed.");
+		CPRINTS("p%d: sink enable failed.", port);
 		return EC_ERROR_UNKNOWN;
 	}
 
diff --git a/board/cheza/board.c b/board/cheza/board.c
index 6874503238..1a8400fadb 100644
--- a/board/cheza/board.c
+++ b/board/cheza/board.c
@@ -576,7 +576,7 @@ int board_set_active_charge_port(int port)
 
 	/* Enable requested charge port. */
 	if (board_vbus_sink_enable(port, 1)) {
-		CPRINTS("p%d: sink path enable failed.");
+		CPRINTS("p%d: sink path enable failed.", port);
 		return EC_ERROR_UNKNOWN;
 	}
 
diff --git a/board/cr50/board.c b/board/cr50/board.c
index 606e8ffb82..f2b7c7be55 100644
--- a/board/cr50/board.c
+++ b/board/cr50/board.c
@@ -1364,7 +1364,7 @@ static uint32_t get_properties(void)
 		 * is no point in checking for a matching config table entry.
 		 * For this case use default properties.
 		 */
-		CPRINTS("Invalid strap pins! Default properties = 0x%x",
+		CPRINTS("Invalid strap pins! Default properties = 0x%lx",
 			BOARD_PROPERTIES_DEFAULT);
 		return BOARD_PROPERTIES_DEFAULT;
 	}
diff --git a/board/nocturne/board.c b/board/nocturne/board.c
index eac0b14b27..4750b3c433 100644
--- a/board/nocturne/board.c
+++ b/board/nocturne/board.c
@@ -742,7 +742,7 @@ int board_set_active_charge_port(int port)
 
 	/* Enable requested charge port. */
 	if (ppc_vbus_sink_enable(port, 1)) {
-		CPRINTS("p%d: sink path enable failed.");
+		CPRINTS("p%d: sink path enable failed.", port);
 		charger_discharge_on_ac(0);
 		return EC_ERROR_UNKNOWN;
 	}
diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c
index 52a87c285b..c18c6073b9 100644
--- a/board/zinger/usb_pd_policy.c
+++ b/board/zinger/usb_pd_policy.c
@@ -344,7 +344,7 @@ int pd_board_checks(void)
 				break;
 		/* trigger the slow OCP iff all 4 samples are above the max */
 		if (count == 3) {
-			debug_printf("OCP %d mA\n",
+			debug_printf("OCP %ld mA\n",
 			  vbus_amp * VDDA_MV / CURR_GAIN * 1000
 				   / R_SENSE / ADC_SCALE);
 			pd_log_event(PD_EVENT_PS_FAULT, 0, PS_FAULT_OCP, NULL);
@@ -375,7 +375,7 @@ int pd_board_checks(void)
 	if ((output_is_enabled() && (vbus_volt > voltages[ovp_idx].ovp)) ||
 	    (fault && (vbus_volt > voltages[ovp_idx].ovp_rec))) {
 		if (!fault) {
-			debug_printf("OVP %d mV\n",
+			debug_printf("OVP %ld mV\n",
 				     ADC_TO_VOLT_MV(vbus_volt));
 			pd_log_event(PD_EVENT_PS_FAULT, 0, PS_FAULT_OVP, NULL);
 		}
@@ -395,7 +395,7 @@ int pd_board_checks(void)
 		discharge_disable();
 		/* enable over-current monitoring */
 		adc_enable_watchdog(ADC_CH_A_SENSE, MAX_CURRENT_FAST, 0);
-		debug_printf("Disch FAIL %d mV\n",
+		debug_printf("Disch FAIL %ld mV\n",
 			     ADC_TO_VOLT_MV(vbus_volt));
 		pd_log_event(PD_EVENT_PS_FAULT, 0, PS_FAULT_DISCH, NULL);
 		fault = FAULT_DISCHARGE;
diff --git a/chip/g/loader/launch.c b/chip/g/loader/launch.c
index 823e29489b..777724bc81 100644
--- a/chip/g/loader/launch.c
+++ b/chip/g/loader/launch.c
@@ -226,7 +226,8 @@ void tryLaunch(uint32_t adr, size_t max_size)
 	/* TODO: lock FLASH_REGION 1? */
 	disarmRAMGuards();
 
-	debug_printf("Valid image found at 0x%08x, jumping", hdr);
+	debug_printf("Valid image found at 0x%08lx, jumping",
+		     (unsigned long)hdr);
 	uart_tx_flush();
 
 	_jump_to_address(&hdr[1]);
diff --git a/chip/g/loader/rom_flash.c b/chip/g/loader/rom_flash.c
index 3e70961503..9666f2464a 100644
--- a/chip/g/loader/rom_flash.c
+++ b/chip/g/loader/rom_flash.c
@@ -21,8 +21,8 @@ static int _flash_error(void)
 
 	retval = GREG32(FLASH, FSH_ERROR);
 	if (retval) {
-		debug_printf("ERROR: Read to FLASH_FSH_ERROR (%x) ");
-		debug_printf("did not clear it\n", retval);
+		debug_printf("ERROR: Read to FLASH_FSH_ERROR (%x) "
+			     "did not clear it\n", retval);
 	}
 
 	return retval;
diff --git a/chip/ish/power_mgt.c b/chip/ish/power_mgt.c
index 83115a342c..f6ef5f8e0b 100644
--- a/chip/ish/power_mgt.c
+++ b/chip/ish/power_mgt.c
@@ -630,8 +630,8 @@ static int command_idle_stats(int argc, char **argv)
 
 	if (pm_ctx.aon_valid) {
 		ccprintf("    Aontask status:\n");
-		ccprintf("        last error:   %lu\n", aon_share->last_error);
-		ccprintf("        error counts: %lu\n", aon_share->error_count);
+		ccprintf("        last error:   %u\n", aon_share->last_error);
+		ccprintf("        error counts: %u\n", aon_share->error_count);
 	}
 
 	return EC_SUCCESS;
diff --git a/chip/lm4/i2c.c b/chip/lm4/i2c.c
index b95fcba0b0..34e320872c 100644
--- a/chip/lm4/i2c.c
+++ b/chip/lm4/i2c.c
@@ -191,7 +191,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
 			    (i2c_get_line_levels(port) != I2C_LINE_IDLE))) {
 		uint32_t tpr = LM4_I2C_MTPR(port);
 
-		CPRINTS("I2C%d Addr:%02X bad status 0x%02x, SCL=%d, SDA=%d",
+		CPRINTS("I2C%d Addr:%02X bad status 0x%02x, SCL=%ld, SDA=%ld",
 			port,
 			I2C_GET_ADDR(slave_addr_flags),
 			reg_mcs,
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c
index 6a0fa0a5cc..5d44f362ea 100644
--- a/chip/mec1322/i2c.c
+++ b/chip/mec1322/i2c.c
@@ -265,7 +265,7 @@ int chip_i2c_xfer(const int port,
 	    (((reg & (STS_BER | STS_LAB)) || !(reg & STS_NBB)) ||
 			    (get_line_level(controller)
 			    != I2C_LINE_IDLE))) {
-		CPRINTS("i2c%s bad status 0x%02x, SCL=%d, SDA=%d",
+		CPRINTS("i2c%s bad status 0x%02x, SCL=%ld, SDA=%ld",
 			i2c_port_names[port], reg,
 			get_line_level(controller) & I2C_LINE_SCL_HIGH,
 			get_line_level(controller) & I2C_LINE_SDA_HIGH);
diff --git a/chip/npcx/i2c.c b/chip/npcx/i2c.c
index 44761a7fe9..6b87c3f4e0 100644
--- a/chip/npcx/i2c.c
+++ b/chip/npcx/i2c.c
@@ -790,8 +790,9 @@ static void i2c_freq_changed(void)
 				/* Set value from formula */
 				NPCX_SMBSCLLT(ctrl) = scl_freq;
 				NPCX_SMBSCLHT(ctrl) = scl_freq;
-				cprints(CC_I2C, "Warning: Use 400K or 1MHz "
-					"for better timing of I2c %d", ctrl);
+				cprints(CC_I2C,
+					"Warning: Use 400K or 1MHz for better timing of I2c %d",
+					ctrl);
 				continue;
 			}
 
@@ -806,8 +807,9 @@ static void i2c_freq_changed(void)
 				}
 			}
 			if (j == i2c_timing_used)
-				cprints(CC_I2C, "Error: Please make sure src "
-					"clock of i2c %d is supported", ctrl);
+				cprints(CC_I2C,
+					"Error: Please make sure src clock of i2c %d is supported",
+					ctrl);
 		}
 	}
 }
diff --git a/chip/stm32/usb_dwc.c b/chip/stm32/usb_dwc.c
index 49554c8cb6..eef2424842 100644
--- a/chip/stm32/usb_dwc.c
+++ b/chip/stm32/usb_dwc.c
@@ -232,7 +232,8 @@ int usb_write_ep(uint32_t ep_num, int len, void *data)
 	struct dwc_usb_ep *ep = usb_ctl.ep[ep_num];
 
 	if (GR_USB_DIEPCTL(ep_num) & DXEPCTL_EPENA) {
-		CPRINTS("usb_write_ep ep%d: FAIL: tx already in progress!");
+		CPRINTS("usb_write_ep ep%d: FAIL: tx already in progress!",
+			ep_num);
 		return 0;
 	}
 
diff --git a/chip/stm32/usb_hid_keyboard.c b/chip/stm32/usb_hid_keyboard.c
index 9503e99c1e..c6d6fb3292 100644
--- a/chip/stm32/usb_hid_keyboard.c
+++ b/chip/stm32/usb_hid_keyboard.c
@@ -543,8 +543,8 @@ static void keyboard_process_queue(void)
 	while (queue_count(&key_queue) > 0) {
 		queue_peek_units(&key_queue, &ev, 0, 1);
 		if (keyboard_debug)
-			CPRINTF(" =%02x/%d %d %d\n", ev.keycode, ev.pressed,
-				ev.time - now);
+			CPRINTF(" =%02x/%d %d %d\n", ev.keycode, ev.keycode,
+				ev.pressed, ev.time - now);
 
 		if ((now - ev.time) <= KEY_DISCARD_MAX_TIME &&
 		    (ev.time - first_key_time) >= COALESCE_INTERVAL)
diff --git a/common/bluetooth_le.c b/common/bluetooth_le.c
index 5e611d1dd1..94d006781d 100644
--- a/common/bluetooth_le.c
+++ b/common/bluetooth_le.c
@@ -139,7 +139,7 @@ static void mem_dump(uint8_t *mem, int len)
 	for (i = 0; i < len; i++) {
 		value = mem[i];
 		if (i % 8 == 0)
-			CPRINTF("\n%08x: %02x", &mem[i], value);
+			CPRINTF("\n%08lx: %02x", (unsigned long)&mem[i], value);
 		else
 			CPRINTF(" %02x", value);
 	}
diff --git a/common/btle_ll.c b/common/btle_ll.c
index ef081b9526..cecbb3058a 100644
--- a/common/btle_ll.c
+++ b/common/btle_ll.c
@@ -846,7 +846,7 @@ void bluetooth_ll_task(void)
 
 			if (ll_state == STANDBY) {
 				CPRINTF("Exiting connection state/Entering "
-					"Standby state after %d connections ",
+					"Standby state after %d connections "
 					"events\n", ll_conn_events);
 				print_connection_state();
 			}
diff --git a/common/console_output.c b/common/console_output.c
index 86072d9b62..fb6e91a368 100644
--- a/common/console_output.c
+++ b/common/console_output.c
@@ -147,7 +147,7 @@ static int command_ch(int argc, char **argv)
 	/* Print the list of channels */
 	ccputs(" # Mask     E Channel\n");
 	for (i = 0; i < CC_CHANNEL_COUNT; i++) {
-		ccprintf("%2d %08x %c %s\n",
+		ccprintf("%2d %08lx %c %s\n",
 			 i, CC_MASK(i),
 			 (channel_mask & CC_MASK(i)) ? '*' : ' ',
 			 channel_names[i]);
diff --git a/common/factory_mode.c b/common/factory_mode.c
index 9198cc936c..c1d6789b91 100644
--- a/common/factory_mode.c
+++ b/common/factory_mode.c
@@ -43,7 +43,7 @@ DECLARE_HOOK(HOOK_CCD_CHANGE, ccd_config_changed, HOOK_PRIO_LAST);
 
 static void force_system_reset(void)
 {
-	CPRINTS("%s: ccd hook didn't reset the system");
+	CPRINTS("ccd hook didn't reset the system");
 	factory_config_saved(0);
 }
 DECLARE_DEFERRED(force_system_reset);
diff --git a/common/motion_sense.c b/common/motion_sense.c
index ef9cdef185..73659ab161 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -155,11 +155,11 @@ int motion_sense_set_data_rate(struct motion_sensor_t *sensor)
 		return ret;
 
 #ifdef CONFIG_CONSOLE_VERBOSE
-	CPRINTS("%s ODR: %d - roundup %d from config %d [AP %d]",
+	CPRINTS("%s ODR: %d - roundup %d from config %d [AP %ld]",
 		sensor->name, odr, roundup, config_id,
 		BASE_ODR(sensor->config[SENSOR_CONFIG_AP].odr));
 #else
-	CPRINTS("%c%d ODR %d rup %d cfg %d AP %d",
+	CPRINTS("%c%d ODR %d rup %d cfg %d AP %ld",
 		sensor->name[0], sensor->type, odr, roundup, config_id,
 		BASE_ODR(sensor->config[SENSOR_CONFIG_AP].odr));
 #endif
@@ -1669,7 +1669,7 @@ static int command_display_accel_info(int argc, char **argv)
 		ccprintf("max_freq: %d\n", motion_sensors[i].max_frequency);
 		ccprintf("config:\n");
 		for (j = 0; j < SENSOR_CONFIG_MAX; j++) {
-			ccprintf("%d - odr: %umHz, ec_rate: %uus\n", j,
+			ccprintf("%d - odr: %lumHz, ec_rate: %uus\n", j,
 				motion_sensors[i].config[j].odr &
 				~ROUND_UP_FLAG,
 				motion_sensors[i].config[j].ec_rate);
diff --git a/common/nvmem.c b/common/nvmem.c
index 77c3fe2040..4b4d8fc590 100644
--- a/common/nvmem.c
+++ b/common/nvmem.c
@@ -464,7 +464,7 @@ void nvmem_disable_commits(void)
 int nvmem_commit(void)
 {
 	if (nvmem_mutex.task == TASK_ID_COUNT) {
-		CPRINTF("%s: attempt to commit in unlocked state\n",
+		CPRINTF("%s: attempt to commit in unlocked state %d\n",
 			__func__, nvmem_mutex.task);
 		return EC_ERROR_OVERFLOW;  /* Noting to commit. */
 	}
diff --git a/common/panic_output.c b/common/panic_output.c
index 8188cea299..e8233d75cc 100644
--- a/common/panic_output.c
+++ b/common/panic_output.c
@@ -194,12 +194,12 @@ static int command_crash(int argc, char **argv)
 		volatile int zero = 0;
 
 		cflush();
-		ccprintf("%08x", (long)1 / zero);
+		ccprintf("%08lx", (long)1 / zero);
 	} else if (!strcasecmp(argv[1], "udivzero")) {
 		volatile int zero = 0;
 
 		cflush();
-		ccprintf("%08x", (unsigned long)1 / zero);
+		ccprintf("%08lx", (unsigned long)1 / zero);
 #ifdef CONFIG_CMD_STACKOVERFLOW
 	} else if (!strcasecmp(argv[1], "stack")) {
 		stack_overflow_recurse(1);
diff --git a/common/system.c b/common/system.c
index 074ae24af7..7b8b164ea5 100644
--- a/common/system.c
+++ b/common/system.c
@@ -365,8 +365,9 @@ void system_disable_jump(void)
 		 */
 		ret = mpu_protect_data_ram();
 		if (ret == EC_SUCCESS) {
-			CPRINTS("data RAM locked. Exclusion %08x-%08x",
-				&__iram_text_start, &__iram_text_end);
+			CPRINTS("data RAM locked. Exclusion %08lx-%08lx",
+				(unsigned long)&__iram_text_start,
+				(unsigned long)&__iram_text_end);
 		} else {
 			CPRINTS("Failed to lock data RAM (%d)", ret);
 			return;
diff --git a/common/usbc/usb_sm.c b/common/usbc/usb_sm.c
index 3419bf5bb1..ce7c24b332 100644
--- a/common/usbc/usb_sm.c
+++ b/common/usbc/usb_sm.c
@@ -115,8 +115,9 @@ void set_state(const int port, struct sm_ctx *const ctx,
 	 * intended state to transition into.
 	 */
 	if (internal->exit) {
-		CPRINTF("C%d: Ignoring set state to 0x%08x within 0x%08x",
-			port, new_state, ctx->current);
+		CPRINTF("C%d: Ignoring set state to 0x%08lx within 0x%08lx",
+			port, (unsigned long)new_state,
+			(unsigned long)ctx->current);
 		return;
 	}
 
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 6628e41daa..8435c2f637 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -253,7 +253,7 @@ uint32_t switch_handler(int desched, task_id_t resched)
 		return 0;
 
 	if (IS_ENABLED(ISH_DEBUG))
-		CPRINTF("[%d -> %d]\n", current - tasks, next - tasks);
+		CPRINTF("[%ld -> %ld]\n", current - tasks, next - tasks);
 
 	/* Switch to new task */
 	if (IS_ENABLED(CONFIG_TASK_PROFILING))
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c
index 5fd9e3acda..85f8dee7d4 100644
--- a/driver/accelgyro_bmi160.c
+++ b/driver/accelgyro_bmi160.c
@@ -961,7 +961,7 @@ static int load_fifo(struct motion_sensor_t *s, uint32_t last_ts)
 	 */
 	if (beginning == 0x84848484 ||
 			(beginning & 0xdcdcdcdc) == 0x40404040) {
-		CPRINTS("Suspended FIFO: accel ODR/rate: %d/%d: 0x%08x",
+		CPRINTS("Suspended FIFO: accel ODR/rate: %ld/%d: 0x%08x",
 				BASE_ODR(s->config[SENSOR_CONFIG_AP].odr),
 				get_data_rate(s),
 				beginning);
diff --git a/driver/ppc/sn5s330.c b/driver/ppc/sn5s330.c
index c532cace44..231d24b906 100644
--- a/driver/ppc/sn5s330.c
+++ b/driver/ppc/sn5s330.c
@@ -429,7 +429,8 @@ static int sn5s330_init(int port)
 		status = i2c_write8(i2c_port, i2c_addr_flags,
 				    reg, 0xFF);
 		if (status) {
-			CPRINTS("ppc p%d: Failed to write reg 0x%2x!", port);
+			CPRINTS("ppc p%d: Failed to write reg 0x%2x!",
+				port, reg);
 			return status;
 		}
 	}
diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c
index 4753a6d5d8..59f8e59bfa 100644
--- a/driver/tcpm/anx7447.c
+++ b/driver/tcpm/anx7447.c
@@ -268,7 +268,8 @@ static int command_anx_ocm(int argc, char **argv)
 		rv = anx7447_flash_erase_internal(
 			port, 1 /* write to console if empty */);
 		if (rv)
-			ccprintf("C%d: Failed to erase OCM flash (%d)\n", rv);
+			ccprintf("C%d: Failed to erase OCM flash (%d)\n",
+				 port, rv);
 	}
 
 	ccprintf("C%d: OCM flash is %sempty.\n",
diff --git a/driver/wpc/p9221.c b/driver/wpc/p9221.c
index 7ba4271823..5e98737565 100644
--- a/driver/wpc/p9221.c
+++ b/driver/wpc/p9221.c
@@ -710,7 +710,7 @@ static void p9221_notifier_check_vbus(void)
 
 	wpc->p9221_check_vbus = false;
 
-	CPRINTS("%s online:%d vbus:%d is_online:%d", __func__, wpc->online,
+	CPRINTS("%s online:%d vbus:%d", __func__, wpc->online,
 		wpc->vbus_status);
 
 	/*
diff --git a/include/test_util.h b/include/test_util.h
index 55b1849926..124ef77aa4 100644
--- a/include/test_util.h
+++ b/include/test_util.h
@@ -52,8 +52,8 @@
 
 #define TEST_EQ(a, b, fmt) TEST_OPERATOR(a, b, ==, fmt)
 #define TEST_NE(a, b, fmt) TEST_OPERATOR(a, b, !=, fmt)
-#define TEST_BITS_SET(a, bits) TEST_OPERATOR(a & bits, bits, ==, "%u")
-#define TEST_BITS_CLEARED(a, bits) TEST_OPERATOR(a & bits, 0, ==, "%u")
+#define TEST_BITS_SET(a, bits) TEST_OPERATOR(a & (int)bits, (int)bits, ==, "%u")
+#define TEST_BITS_CLEARED(a, bits) TEST_OPERATOR(a & (int)bits, 0, ==, "%u")
 
 #define __ABS(n) ((n) > 0 ? (n) : -(n))
 
diff --git a/power/icelake.c b/power/icelake.c
index 27a8b60c97..db006a8d87 100644
--- a/power/icelake.c
+++ b/power/icelake.c
@@ -61,7 +61,7 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 {
 	int timeout_ms = 50;
 
-	CPRINTS("%s()", __func__, reason);
+	CPRINTS("%s() %d", __func__, reason);
 	report_ap_reset(reason);
 
 	/* Turn off RMSRST_L  to meet tPCH12 */