diff options
author | Nicolas Boichat <drinkcat@chromium.org> | 2019-06-17 13:08:06 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-06-20 05:52:11 +0000 |
commit | b16b36b94989a0d8e0f2268099f91094668c70f9 (patch) | |
tree | ce9f912e6dbb0ed05cfb958f21e1ff67a7898292 | |
parent | bbe3abd8dbee0a91b5bfad214821768610b10371 (diff) | |
download | chrome-ec-b16b36b94989a0d8e0f2268099f91094668c70f9.tar.gz |
ec: Remove extraneous new line as the end of CPRINTS strings
CPRINTS already prints a new line, no need to add another one.
Spotted during boot on kukui, and then realized there are many
more instances:
""
[3.689239 Module 7 is not supported for clock disable
]
""
BRANCH=none
BUG=none
TEST=make buildall -j
TEST=`git grep CPRINTS | grep "\\\\n\""` shows nothing of
interest.
Change-Id: I4d2bbbc65a91fa56c6e6115aa5c353bfd2b384a1
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1660519
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r-- | board/cr50/wp.c | 4 | ||||
-rw-r--r-- | board/flapjack/board.c | 2 | ||||
-rw-r--r-- | board/nami/battery.c | 2 | ||||
-rw-r--r-- | board/pdeval-stm32f072/usb_pd_policy.c | 4 | ||||
-rw-r--r-- | board/samus_pd/board.c | 2 | ||||
-rw-r--r-- | chip/ish/i2c.c | 2 | ||||
-rw-r--r-- | chip/ish/ipc_heci.c | 16 | ||||
-rw-r--r-- | chip/it83xx/i2c_slave.c | 2 | ||||
-rw-r--r-- | chip/mchp/i2c.c | 2 | ||||
-rw-r--r-- | chip/npcx/hwtimer.c | 2 | ||||
-rw-r--r-- | chip/npcx/i2c.c | 2 | ||||
-rw-r--r-- | chip/nrf51/bluetooth_le.c | 2 | ||||
-rw-r--r-- | chip/stm32/clock-stm32f0.c | 2 | ||||
-rw-r--r-- | chip/stm32/clock-stm32f4.c | 2 | ||||
-rw-r--r-- | common/ccd_config.c | 2 | ||||
-rw-r--r-- | common/keyboard_scan.c | 2 | ||||
-rw-r--r-- | common/usb_pd_tcpc.c | 2 | ||||
-rw-r--r-- | driver/accelgyro_lsm6dso.c | 4 | ||||
-rw-r--r-- | driver/led/max695x.c | 2 | ||||
-rw-r--r-- | driver/temp_sensor/bd99992gw.c | 6 | ||||
-rw-r--r-- | power/common.c | 2 |
21 files changed, 33 insertions, 33 deletions
diff --git a/board/cr50/wp.c b/board/cr50/wp.c index 0e2a4020af..c90615b349 100644 --- a/board/cr50/wp.c +++ b/board/cr50/wp.c @@ -412,7 +412,7 @@ static int lock_enforced(const struct RollbackSpaceFwmp *fwmp) /* Let's verify that the FWMP structure makes sense. */ if (fwmp->struct_size != sizeof(*fwmp)) { - CPRINTS("%s: fwmp size mismatch (%d)\n", __func__, + CPRINTS("%s: fwmp size mismatch (%d)", __func__, fwmp->struct_size); return 1; } @@ -420,7 +420,7 @@ static int lock_enforced(const struct RollbackSpaceFwmp *fwmp) crc = crc8(&fwmp->struct_version, sizeof(struct RollbackSpaceFwmp) - offsetof(struct RollbackSpaceFwmp, struct_version)); if (fwmp->crc != crc) { - CPRINTS("%s: fwmp crc mismatch\n", __func__); + CPRINTS("%s: fwmp crc mismatch", __func__); return 1; } diff --git a/board/flapjack/board.c b/board/flapjack/board.c index 31be3b4beb..5549e7b97e 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -145,7 +145,7 @@ static void board_setup_panel(void) rv |= i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR, MT6370_BACKLIGHT_BLPWM, 0xac); if (rv) - CPRINTS("Board setup panel failed\n"); + CPRINTS("Board setup panel failed"); } static enum panel_id board_get_panel_id(void) diff --git a/board/nami/battery.c b/board/nami/battery.c index 19c377371a..6b4a4a9119 100644 --- a/board/nami/battery.c +++ b/board/nami/battery.c @@ -354,7 +354,7 @@ static int battery_check_disconnect(void) if (fuel_gauge == GAUGE_TYPE_UNKNOWN) { fuel_gauge = get_gauge_ic(); - CPRINTS("fuel_gauge=%d\n", fuel_gauge); + CPRINTS("fuel_gauge=%d", fuel_gauge); } switch (fuel_gauge) { diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c index ba899f5efb..86062725fe 100644 --- a/board/pdeval-stm32f072/usb_pd_policy.c +++ b/board/pdeval-stm32f072/usb_pd_policy.c @@ -301,7 +301,7 @@ static int svdm_dp_config(int port, uint32_t *payload) mux_state |= MUX_POLARITY_INVERTED; #endif - CPRINTS("pin_mode = %d\n", pin_mode); + CPRINTS("pin_mode = %d", pin_mode); if (!pin_mode) return 0; @@ -348,7 +348,7 @@ static int svdm_dp_attention(int port, uint32_t *payload) int lvl = PD_VDO_DPSTS_HPD_LVL(payload[1]); int irq = PD_VDO_DPSTS_HPD_IRQ(payload[1]); - CPRINTS("Attention: 0x%x\n", payload[1]); + CPRINTS("Attention: 0x%x", payload[1]); anx7447_tcpc_update_hpd_status(port, lvl, irq); #endif dp_status[port] = payload[1]; diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index c49844c370..772ee2cb3f 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -338,7 +338,7 @@ int board_set_active_charge_port(int charge_port) gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 1); charge_state = PD_CHARGE_NONE; pd_status.active_charge_port = charge_port; - CPRINTS("Chg: None\n"); + CPRINTS("Chg: None"); return EC_SUCCESS; } diff --git a/chip/ish/i2c.c b/chip/ish/i2c.c index 0cb445cea0..9099c983b9 100644 --- a/chip/ish/i2c.c +++ b/chip/ish/i2c.c @@ -439,7 +439,7 @@ static void i2c_interrupt_handler(struct i2c_context *ctx) if (IS_ENABLED(INTR_DEBUG)) CPRINTS("INTR_STAT = 0x%04x, TX_ABORT_SRC = 0x%04x, " - "RAW_INTR_STAT = 0x%04x\n", + "RAW_INTR_STAT = 0x%04x", ctx->interrupts, ctx->reason, raw_intr); /* disable interrupts */ diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c index 1eb3e7da4d..9e62c33520 100644 --- a/chip/ish/ipc_heci.c +++ b/chip/ish/ipc_heci.c @@ -234,7 +234,7 @@ static int ipc_write_raw_timestamp(struct ipc_if_ctx *ctx, uint32_t drbl, memcpy(msg->payload, payload, payload_size); queue_advance_tail(q, 1); } else { - CPRINTS("tx queue is full\n"); + CPRINTS("tx queue is full"); res = -IPC_ERR_TX_QUEUE_FULL; } @@ -301,7 +301,7 @@ static int ipc_get_protocol_data(const struct ipc_if_ctx *ctx, payload_size = IPC_DB_MSG_LENGTH(drbl_val); if (payload_size > IPC_MAX_PAYLOAD_SIZE) { - CPRINTS("invalid msg : payload is too big\n"); + CPRINTS("invalid msg : payload is too big"); return -IPC_ERR_INVALID_MSG; } @@ -315,12 +315,12 @@ static int ipc_get_protocol_data(const struct ipc_if_ctx *ctx, len = payload_size + sizeof(drbl_val); break; default: - CPRINTS("protocol %d not supported yet\n", protocol); + CPRINTS("protocol %d not supported yet", protocol); break; } if (len > buf_size) { - CPRINTS("buffer is smaller than payload\n"); + CPRINTS("buffer is smaller than payload"); return -IPC_ERR_TOO_SMALL_BUFFER; } @@ -492,12 +492,12 @@ int ipc_write_timestamp(const ipc_handle_t handle, const void *buf, ctx = ipc_handle_to_if_ctx(handle); if (ctx->initialized == 0) { - CPRINTS("open_ipc() for the peer is never called\n"); + CPRINTS("open_ipc() for the peer is never called"); return -EC_ERROR_INVAL; } if (!ctx->msg_events[protocol].enabled) { - CPRINTS("call open_ipc() for the protocol first\n"); + CPRINTS("call open_ipc() for the protocol first"); return -EC_ERROR_INVAL; } @@ -587,7 +587,7 @@ static void handle_mng_commands(const ipc_handle_t handle, case MNG_RX_CMPL_DISABLE: case MNG_RX_CMPL_INDICATION: case MNG_RESET_NOTIFY: - CPRINTS("msg not handled %d\n", IPC_DB_CMD(msg->drbl)); + CPRINTS("msg not handled %d", IPC_DB_CMD(msg->drbl)); break; case MNG_RESET_NOTIFY_ACK: ipc_rst = (struct ipc_rst_payload *)msg->payload; @@ -710,7 +710,7 @@ void ipc_mng_task(void) /* allow doorbell with any payload */ if (payload_size < 0) { - CPRINTS("ipc_read error. discard msg\n"); + CPRINTS("ipc_read error. discard msg"); continue; /* TODO: retry several and exit */ } diff --git a/chip/it83xx/i2c_slave.c b/chip/it83xx/i2c_slave.c index 066ea6334a..bce86d25b8 100644 --- a/chip/it83xx/i2c_slave.c +++ b/chip/it83xx/i2c_slave.c @@ -173,7 +173,7 @@ void i2c_slave_read_write_data(int port) * TODO(b:129360157): Handle master write * data by "in_data" array. */ - CPRINTS("WData: %.*h\n", + CPRINTS("WData: %.*h", I2C_MAX_BUFFER_SIZE, in_data[idx]); wr_done[idx] = 0; } diff --git a/chip/mchp/i2c.c b/chip/mchp/i2c.c index f47f209947..489d374195 100644 --- a/chip/mchp/i2c.c +++ b/chip/mchp/i2c.c @@ -501,7 +501,7 @@ static int i2c_check_recover(int port, int controller) if ((((reg & (STS_BER | STS_LAB)) || !(reg & STS_NBB)) || (lines != I2C_LINE_IDLE))) { cdata[controller].flags |= (1ul << 16); - CPRINTS("I2C%d port%d recov status 0x%02x, SDA:SCL=0x%0x\n", + CPRINTS("I2C%d port%d recov status 0x%02x, SDA:SCL=0x%0x", controller, port, reg, lines); /* Attempt to unwedge the port. */ if (lines != I2C_LINE_IDLE) diff --git a/chip/npcx/hwtimer.c b/chip/npcx/hwtimer.c index 26f4856508..f4c47daf33 100644 --- a/chip/npcx/hwtimer.c +++ b/chip/npcx/hwtimer.c @@ -89,7 +89,7 @@ void __hw_clock_event_set(uint32_t deadline) */ evt_cnt = FP_TO_INT((fp_inter_t)(evt_cnt_us) * inv_evt_tick); if (evt_cnt > TICK_EVT_MAX_CNT) { - CPRINTS("Event overflow! 0x%08x, us is %d\r\n", + CPRINTS("Event overflow! 0x%08x, us is %d", evt_cnt, evt_cnt_us); evt_cnt = TICK_EVT_MAX_CNT; } diff --git a/chip/npcx/i2c.c b/chip/npcx/i2c.c index 0b726cb2bf..0b99f24270 100644 --- a/chip/npcx/i2c.c +++ b/chip/npcx/i2c.c @@ -675,7 +675,7 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, /* Reset task ID */ p_status->task_waiting = TASK_ID_INVALID; - CPRINTS("-Err:0x%02x\n", p_status->err_code); + CPRINTS("-Err:0x%02x", p_status->err_code); return (p_status->err_code == SMB_OK) ? EC_SUCCESS : EC_ERROR_UNKNOWN; } diff --git a/chip/nrf51/bluetooth_le.c b/chip/nrf51/bluetooth_le.c index f4747cf83e..1c18a8a84f 100644 --- a/chip/nrf51/bluetooth_le.c +++ b/chip/nrf51/bluetooth_le.c @@ -513,7 +513,7 @@ static int command_ble_adv_scan(int argc, char **argv) CPRINTS("ADV Listen"); if (addr_lsbyte != -1) - CPRINTS("filtered (%x)\n", addr_lsbyte); + CPRINTS("filtered (%x)", addr_lsbyte); for (i = 0; i < packets; i++) { rv = ble_rx(&rcv_packet, 1000000, 1); diff --git a/chip/stm32/clock-stm32f0.c b/chip/stm32/clock-stm32f0.c index 32d77e8fce..2e7937514e 100644 --- a/chip/stm32/clock-stm32f0.c +++ b/chip/stm32/clock-stm32f0.c @@ -427,7 +427,7 @@ void clock_enable_module(enum module_id module, int enable) return; } - CPRINTS("Module %d is not supported for clock %s\n", + CPRINTS("Module %d is not supported for clock %s", module, enable ? "enable" : "disable"); } diff --git a/chip/stm32/clock-stm32f4.c b/chip/stm32/clock-stm32f4.c index 8dbfd2fcca..5c92ab7725 100644 --- a/chip/stm32/clock-stm32f4.c +++ b/chip/stm32/clock-stm32f4.c @@ -235,7 +235,7 @@ void clock_enable_module(enum module_id module, int enable) return; } - CPRINTS("Module %d is not supported for clock %s\n", + CPRINTS("Module %d is not supported for clock %s", module, enable ? "enable" : "disable"); } diff --git a/common/ccd_config.c b/common/ccd_config.c index d51c4eed45..fc9409a13f 100644 --- a/common/ccd_config.c +++ b/common/ccd_config.c @@ -1447,7 +1447,7 @@ static enum vendor_cmd_rc ccd_vendor(struct vendor_cmd_params *p) break; default: - CPRINTS("%s:%d - unknown subcommand\n", __func__, __LINE__); + CPRINTS("%s:%d - unknown subcommand", __func__, __LINE__); return VENDOR_RC_NO_SUCH_SUBCOMMAND; } diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 7366c8d95e..787fb8f937 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -304,7 +304,7 @@ static void read_matrix_id(uint8_t *id) /* Read the row state */ id[c] = keyboard_raw_read_rows(); - CPRINTS("Keyboard ID%u: 0x%02x\n", c, id[c]); + CPRINTS("Keyboard ID%u: 0x%02x", c, id[c]); } keyboard_raw_drive_column(KEYBOARD_COLUMN_NONE); diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index e39ca998f4..216793381f 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -589,7 +589,7 @@ static inline int decode_short(int port, int off, uint16_t *val16) end = pd_dequeue_bits(port, off, 20, &w); #if 0 /* DEBUG */ - CPRINTS("%d-%d: %05x %x:%x:%x:%x\n", + CPRINTS("%d-%d: %05x %x:%x:%x:%x", off, end, w, dec4b5b[(w >> 15) & 0x1f], dec4b5b[(w >> 10) & 0x1f], dec4b5b[(w >> 5) & 0x1f], dec4b5b[(w >> 0) & 0x1f]); diff --git a/driver/accelgyro_lsm6dso.c b/driver/accelgyro_lsm6dso.c index d50e24aa17..9517712138 100644 --- a/driver/accelgyro_lsm6dso.c +++ b/driver/accelgyro_lsm6dso.c @@ -251,7 +251,7 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event) return ret; if (fsts.len & (LSM6DSO_FIFO_DATA_OVR | LSM6DSO_FIFO_FULL)) { - CPRINTS("%s FIFO Overrun: %04x\n", s->name, fsts.len); + CPRINTS("%s FIFO Overrun: %04x", s->name, fsts.len); } if (fsts.len & LSM6DSO_FIFO_DIFF_MASK) @@ -480,7 +480,7 @@ static int init(const struct motion_sensor_t *s) err_unlock: mutex_unlock(s->mutex); - CPRINTS("%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/led/max695x.c b/driver/led/max695x.c index a563edaf26..6f0e1b8e84 100644 --- a/driver/led/max695x.c +++ b/driver/led/max695x.c @@ -68,7 +68,7 @@ int display_7seg_write(enum seven_seg_module_display module, uint16_t data) buf[1] = 0x00; break; default: - CPRINTS("Unknown Module\n"); + CPRINTS("Unknown Module"); return EC_ERROR_UNKNOWN; } /* Segment - 1 */ diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c index f2a48eb2d5..291ce32479 100644 --- a/driver/temp_sensor/bd99992gw.c +++ b/driver/temp_sensor/bd99992gw.c @@ -41,7 +41,7 @@ static int raw_read8(const int offset, int *data_ptr) int ret; ret = i2c_read8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR, offset, data_ptr); if (ret != EC_SUCCESS) - CPRINTS("bd99992gw read fail %d\n", ret); + CPRINTS("bd99992gw read fail %d", ret); return ret; } @@ -50,7 +50,7 @@ static int raw_write8(const int offset, int data) int ret; ret = i2c_write8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR, offset, data); if (ret != EC_SUCCESS) - CPRINTS("bd99992gw write fail %d\n", ret); + CPRINTS("bd99992gw write fail %d", ret); return ret; } @@ -136,7 +136,7 @@ int bd99992gw_get_val(int idx, int *temp_ptr) /* Make sure we found it */ if (i == ARRAY_SIZE(active_channels) || active_channels[i] != idx) { - CPRINTS("Bad ADC channel %d\n", idx); + CPRINTS("Bad ADC channel %d", idx); return EC_ERROR_INVAL; } diff --git a/power/common.c b/power/common.c index c918138b6f..13c620a6b1 100644 --- a/power/common.c +++ b/power/common.c @@ -704,7 +704,7 @@ void power_signal_interrupt(enum gpio_signal signal) if (power_signal_list[i].gpio == signal) { if (power_signal_interrupt_count[i]++ == CONFIG_POWER_SIGNAL_INTERRUPT_STORM_DETECT_THRESHOLD) - CPRINTS("Interrupt storm! Signal %d\n", i); + CPRINTS("Interrupt storm! Signal %d", i); break; } } |