cleanup: DECLARE_CONSOLE_COMMAND only needs 4 args

Since pretty much always, we've declared console commands to take
a "longhelp" argument with detailed explanations of what the
command does. But since almost as long, we've never actually used
that argument for anything - we just silently throw it away in
the macro. There's only one command (usbchargemode) that even
thinks it defines that argument.

We're never going to use this, let's just get rid of it.

BUG=none
BRANCH=none
CQ-DEPEND=CL:*279060
CQ-DEPEND=CL:*279158
CQ-DEPEND=CL:*279037
TEST=make buildall; tested on Cr50 hardware

Everything builds. Since we never used this arg anyway, there had
better not be any difference in the result.

Change-Id: Id3f71a53d02e3dc625cfcc12aa71ecb50e35eb9f
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/374163
Reviewed-by: Myles Watson <mylesgw@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>

54 files changed, 121 insertions, 220 deletions

diff --git a/common/adc.c b/common/adc.c
index 431a857de3..6375291a85 100644
--- a/common/adc.c
+++ b/common/adc.c
@@ -62,6 +62,5 @@ static int command_adc(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(adc, command_adc,
 			"[name]",
-			"Print ADC channel(s)",
-			NULL);
+			"Print ADC channel(s)");
 #endif
diff --git a/common/als.c b/common/als.c
index 96a1550570..6e80b23548 100644
--- a/common/als.c
+++ b/common/als.c
@@ -118,6 +118,5 @@ static int command_als(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(als, command_als,
 			NULL,
-			"Print ALS values",
-			NULL);
+			"Print ALS values");
 #endif
diff --git a/common/ap_hang_detect.c b/common/ap_hang_detect.c
index 08bcff036a..b5098e15b2 100644
--- a/common/ap_hang_detect.c
+++ b/common/ap_hang_detect.c
@@ -234,5 +234,4 @@ static int command_hang_detect(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hangdet, command_hang_detect,
 			NULL,
-			"Print hang detect state",
-			NULL);
+			"Print hang detect state");
diff --git a/common/battery.c b/common/battery.c
index ae3d548676..9f1da6c4fb 100644
--- a/common/battery.c
+++ b/common/battery.c
@@ -268,8 +268,7 @@ static int command_battery(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(battery, command_battery,
 			"<repeat_count> <sleep_ms>",
-			"Print battery info",
-			NULL);
+			"Print battery info");
 
 #ifdef CONFIG_BATTERY_CUT_OFF
 int battery_is_cut_off(void)
@@ -360,8 +359,7 @@ static int command_cutoff(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(cutoff, command_cutoff,
 		"[at-shutdown]",
-		"Cut off the battery output",
-		NULL);
+		"Cut off the battery output");
 #else
 int battery_is_cut_off(void)
 {
@@ -406,8 +404,7 @@ static int console_command_battery_vendor_param(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(battparam, console_command_battery_vendor_param,
 			"<param> [value]",
-			"Get or set battery vendor parameters",
-			NULL);
+			"Get or set battery vendor parameters");
 
 static int host_command_battery_vendor_param(struct host_cmd_handler_args *args)
 {
diff --git a/common/btle_hci_controller.c b/common/btle_hci_controller.c
index 49b189ce66..3d4076b073 100644
--- a/common/btle_hci_controller.c
+++ b/common/btle_hci_controller.c
@@ -509,8 +509,7 @@ static int command_ble_hci_cmd(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ble_hci_cmd, command_ble_hci_cmd,
 			"opcode len uint32 uint32 uint32... (little endian)",
-			"Send an hci command of length len",
-			NULL);
+			"Send an hci command of length len");
 
 static int command_hcitool(int argc, char **argv)
 {
@@ -550,8 +549,7 @@ static int command_hcitool(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hcitool, command_hcitool,
 			"cmd ogf ocf b0 b1 b2 b3... or lcmd opcode len uint32.. (little endian)",
-			"Send an hci command of length len",
-			NULL);
+			"Send an hci command of length len");
 
 static int command_ble_hci_acl(int argc, char **argv)
 {
@@ -596,8 +594,7 @@ static int command_ble_hci_acl(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ble_hci_acl, command_ble_hci_acl,
 			"hdr len uint32 uint32 uint32... (little endian)",
-			"Send hci acl data of length len",
-			NULL);
+			"Send hci acl data of length len");
 
 static int command_ble_hci_adv(int argc, char **argv)
 {
@@ -666,7 +663,6 @@ static int command_ble_hci_adv(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ble_hci_adv, command_ble_hci_adv,
 			"adv [params=0] [scan_rsp=0]",
-			"Use pre-defined parameters to start advertising",
-			NULL);
+			"Use pre-defined parameters to start advertising");
 
 #endif /* CONFIG_BLUETOOTH_HCI_DEBUG */
diff --git a/common/charge_manager.c b/common/charge_manager.c
index e7a7d997c0..a263277db6 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -938,8 +938,7 @@ static int command_charge_port_override(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(chgoverride, command_charge_port_override,
 	"[port | -1 | -2]",
-	"Force charging from a given port (-1 = off, -2 = disable charging)",
-	NULL);
+	"Force charging from a given port (-1 = off, -2 = disable charging)");
 
 #ifdef CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT
 static void charge_manager_set_external_power_limit(int current_lim,
@@ -1010,8 +1009,7 @@ static int command_external_power_limit(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(chglim, command_external_power_limit,
 	"[max_current (mA)] [max_voltage (mV)]",
-	"Set max charger current / voltage",
-	NULL);
+	"Set max charger current / voltage");
 #endif /* CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT */
 
 #ifdef CONFIG_CMD_CHARGE_SUPPLIER_INFO
@@ -1026,5 +1024,5 @@ static int charge_supplier_info(int argc, char **argv)
 	return 0;
 }
 DECLARE_CONSOLE_COMMAND(chgsup, charge_supplier_info,
-			NULL, "print chg supplier info", NULL);
+			NULL, "print chg supplier info");
 #endif
diff --git a/common/charge_ramp.c b/common/charge_ramp.c
index 775093f837..4a1399b54e 100644
--- a/common/charge_ramp.c
+++ b/common/charge_ramp.c
@@ -358,6 +358,5 @@ static int command_chgramp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(chgramp, command_chgramp,
 	"",
-	"Dump charge ramp state info",
-	NULL);
+	"Dump charge ramp state info");
 #endif
diff --git a/common/charge_state_v1.c b/common/charge_state_v1.c
index b38bdc3e0d..fa209a4c1b 100644
--- a/common/charge_state_v1.c
+++ b/common/charge_state_v1.c
@@ -1051,5 +1051,4 @@ static int command_battfake(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(battfake, command_battfake,
 			"percent (-1 = use real level)",
-			"Set fake battery level",
-			NULL);
+			"Set fake battery level");
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 1051365d20..611f60b2a1 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -1346,5 +1346,4 @@ static int command_chgstate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(chgstate, command_chgstate,
 			"[idle|discharge|debug on|off]",
-			"Get/set charge state machine status",
-			NULL);
+			"Get/set charge state machine status");
diff --git a/common/charger.c b/common/charger.c
index df66ea3b59..35e73cccba 100644
--- a/common/charger.c
+++ b/common/charger.c
@@ -205,5 +205,4 @@ static int command_charger(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(charger, command_charger,
 			"[input | current | voltage | dptf] [newval]",
-			"Get or set charger param(s)",
-			NULL);
+			"Get or set charger param(s)");
diff --git a/common/chipset.c b/common/chipset.c
index c62fb6ec7a..1d236fdc14 100644
--- a/common/chipset.c
+++ b/common/chipset.c
@@ -34,8 +34,7 @@ static int command_apreset(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(apreset, command_apreset,
 			"[warm | cold]",
-			"Issue AP reset",
-			NULL);
+			"Issue AP reset");
 
 static int command_apshutdown(int argc, char **argv)
 {
@@ -44,6 +43,5 @@ static int command_apshutdown(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(apshutdown, command_apshutdown,
 			NULL,
-			"Force AP shutdown",
-			NULL);
+			"Force AP shutdown");
 #endif
diff --git a/common/console.c b/common/console.c
index 7cb89aed97..c451de041f 100644
--- a/common/console.c
+++ b/common/console.c
@@ -739,8 +739,7 @@ static int command_help(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(help, command_help,
 			"[ list | <name> ]",
-			"Print command help",
-			NULL);
+			"Print command help");
 
 #ifdef CONFIG_CONSOLE_RESTRICTED_INPUT
 static int command_force_enabled(int argc, char **argv)
@@ -760,8 +759,7 @@ static int command_force_enabled(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(forceen, command_force_enabled,
 			"<on | off>",
-			"Force enable console",
-			NULL);
+			"Force enable console");
 #endif
 
 #ifdef CONFIG_CONSOLE_HISTORY
@@ -779,6 +777,5 @@ static int command_history(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(history, command_history,
 			NULL,
-			"Print console history",
-			NULL);
+			"Print console history");
 #endif
diff --git a/common/console_output.c b/common/console_output.c
index 4794929954..7354ea4392 100644
--- a/common/console_output.c
+++ b/common/console_output.c
@@ -148,5 +148,4 @@ static int command_ch(int argc, char **argv)
 };
 DECLARE_CONSOLE_COMMAND(chan, command_ch,
 			"[ save | restore | <mask> ]",
-			"Save, restore, get or set console channel mask",
-			NULL);
+			"Save, restore, get or set console channel mask");
diff --git a/common/device_state.c b/common/device_state.c
index 650e2671ef..f8e57c35ff 100644
--- a/common/device_state.c
+++ b/common/device_state.c
@@ -101,5 +101,4 @@ static int command_devices(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(devices, command_devices,
 	"",
-	"Get the device states",
-	NULL);
+	"Get the device states");
diff --git a/common/dptf.c b/common/dptf.c
index 638427c3b3..23e597bec9 100644
--- a/common/dptf.c
+++ b/common/dptf.c
@@ -184,5 +184,4 @@ static int command_dptftemp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(dptftemp, command_dptftemp,
 			NULL,
-			"Print DPTF thermal parameters (degrees Kelvin)",
-			NULL);
+			"Print DPTF thermal parameters (degrees Kelvin)");
diff --git a/common/fan.c b/common/fan.c
index ae6a9fea98..6f4425bdc9 100644
--- a/common/fan.c
+++ b/common/fan.c
@@ -132,8 +132,7 @@ static int cc_fanauto(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fanauto, cc_fanauto,
 			"{fan}",
-			"Enable thermal fan control",
-			NULL);
+			"Enable thermal fan control");
 
 /* Return 0 for off, 1 for on, -1 for unknown */
 static int is_powered(int fan)
@@ -188,8 +187,7 @@ static int cc_faninfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(faninfo, cc_faninfo,
 			NULL,
-			"Print fan info",
-			NULL);
+			"Print fan info");
 
 static int cc_fanset(int argc, char **argv)
 {
@@ -241,8 +239,7 @@ static int cc_fanset(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fanset, cc_fanset,
 			"{fan} (rpm | pct%)",
-			"Set fan speed",
-			NULL);
+			"Set fan speed");
 
 static int cc_fanduty(int argc, char **argv)
 {
@@ -276,8 +273,7 @@ static int cc_fanduty(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fanduty, cc_fanduty,
 			"{fan} percent",
-			"Set fan duty cycle",
-			NULL);
+			"Set fan duty cycle");
 
 /*****************************************************************************/
 /* DPTF interface functions */
diff --git a/common/flash.c b/common/flash.c
index b67e8da678..d35701d70d 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -700,8 +700,7 @@ static int command_flash_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flashinfo, command_flash_info,
 			NULL,
-			"Print flash info",
-			NULL);
+			"Print flash info");
 
 #ifdef CONFIG_CMD_FLASH
 static int command_flash_erase(int argc, char **argv)
@@ -722,8 +721,7 @@ static int command_flash_erase(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flasherase, command_flash_erase,
 			"offset [size]",
-			"Erase flash",
-			NULL);
+			"Erase flash");
 
 static int command_flash_write(int argc, char **argv)
 {
@@ -765,8 +763,7 @@ static int command_flash_write(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flashwrite, command_flash_write,
 			"offset [size]",
-			"Write pattern to flash",
-			NULL);
+			"Write pattern to flash");
 
 static int command_flash_read(int argc, char **argv)
 {
@@ -814,8 +811,7 @@ static int command_flash_read(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flashread, command_flash_read,
 			"offset [size]",
-			"Read flash",
-			NULL);
+			"Read flash");
 #endif
 
 static int command_flash_wp(int argc, char **argv)
@@ -843,8 +839,7 @@ static int command_flash_wp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flashwp, command_flash_wp,
 			"<BOOLEAN> | now | rw | norw",
-			"Modify flash write protect",
-			NULL);
+			"Modify flash write protect");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/gesture.c b/common/gesture.c
index d8b3383319..157e3c1f5a 100644
--- a/common/gesture.c
+++ b/common/gesture.c
@@ -329,5 +329,5 @@ static int command_tap_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(tapinfo, command_tap_info,
 			"debug on/off",
-			"Print tap information", NULL);
+			"Print tap information");
 
diff --git a/common/gpio_commands.c b/common/gpio_commands.c
index e3ce1d046d..57bd1602fc 100644
--- a/common/gpio_commands.c
+++ b/common/gpio_commands.c
@@ -134,8 +134,7 @@ static int command_gpio_get(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(gpioget, command_gpio_get,
 			"[name]",
-			"Read GPIO value(s)",
-			NULL);
+			"Read GPIO value(s)");
 
 static int command_gpio_set(int argc, char **argv)
 {
@@ -200,8 +199,7 @@ DECLARE_CONSOLE_COMMAND(gpioset, command_gpio_set,
 #else
 			"name <0 | 1>",
 #endif
-			"Set a GPIO",
-			NULL);
+			"Set a GPIO");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/hooks.c b/common/hooks.c
index b6eb019b7c..6a655b7d3c 100644
--- a/common/hooks.c
+++ b/common/hooks.c
@@ -275,6 +275,5 @@ static int command_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hookstats, command_stats,
 			NULL,
-			"Print stats of hooks",
-			NULL);
+			"Print stats of hooks");
 #endif
diff --git a/common/host_command.c b/common/host_command.c
index 3fa537b0cf..86910499f1 100644
--- a/common/host_command.c
+++ b/common/host_command.c
@@ -868,8 +868,7 @@ static int command_host_command(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hostcmd, command_host_command,
 			"cmd ver param",
-			"Fake host command",
-			NULL);
+			"Fake host command");
 #endif /* CONFIG_CMD_HOSTCMD */
 
 #ifdef CONFIG_CMD_HCDEBUG
@@ -895,6 +894,5 @@ static int command_hcdebug(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hcdebug, command_hcdebug,
 			"hcdebug [off | normal | every | params]",
-			"Set host command debug output mode",
-			NULL);
+			"Set host command debug output mode");
 #endif /* CONFIG_CMD_HCDEBUG */
diff --git a/common/host_command_master.c b/common/host_command_master.c
index d0a16e1331..c567271688 100644
--- a/common/host_command_master.c
+++ b/common/host_command_master.c
@@ -222,6 +222,5 @@ static int command_pd_mcu(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pdcmd, command_pd_mcu,
 			"cmd ver [params]",
-			"Send PD host command",
-			NULL);
+			"Send PD host command");
 
diff --git a/common/host_event_commands.c b/common/host_event_commands.c
index 4b9320c9ce..57365501bc 100644
--- a/common/host_event_commands.c
+++ b/common/host_event_commands.c
@@ -160,8 +160,7 @@ static int command_host_event(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hostevent, command_host_event,
 			"[set | clear | clearb | smi | sci | wake] [mask]",
-			"Print / set host event state",
-			NULL);
+			"Print / set host event state");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/i2c.c b/common/i2c.c
index bd2e780466..7f5a51ddf8 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -717,8 +717,7 @@ static int command_i2cprotect(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(i2cprotect, command_i2cprotect,
 			"[port]",
-			"Protect I2C bus",
-			NULL);
+			"Protect I2C bus");
 #endif
 
 #ifdef CONFIG_CMD_I2C_SCAN
@@ -774,8 +773,7 @@ static int command_scan(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(i2cscan, command_scan,
 			"i2cscan [port]",
-			"Scan I2C ports for devices",
-			NULL);
+			"Scan I2C ports for devices");
 #endif
 
 #ifdef CONFIG_CMD_I2C_XFER
@@ -856,6 +854,5 @@ static int command_i2cxfer(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(i2cxfer, command_i2cxfer,
 			"r/r16/rlen/w/w16 port addr offset [value | len]",
-			"Read write I2C",
-			NULL);
+			"Read write I2C");
 #endif
diff --git a/common/i2c_wedge.c b/common/i2c_wedge.c
index 4fda02896c..7c8ff6be5a 100644
--- a/common/i2c_wedge.c
+++ b/common/i2c_wedge.c
@@ -327,8 +327,7 @@ static int command_i2c_wedge(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(i2cwedge, command_i2c_wedge,
 			"i2cwedge slave_addr out_byte "
 				"[wedge_flag [wedge_bit_count]]",
-			"Wedge host I2C bus",
-			NULL);
+			"Wedge host I2C bus");
 
 static int command_i2c_unwedge(int argc, char **argv)
 {
@@ -338,6 +337,5 @@ static int command_i2c_unwedge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(i2cunwedge, command_i2c_unwedge,
 	"",
-	"Unwedge host I2C bus",
-	NULL);
+	"Unwedge host I2C bus");
 
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c
index b4b39008c3..931583ecfd 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.c
@@ -986,8 +986,7 @@ static int command_typematic(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(typematic, command_typematic,
 			"[first] [inter]",
-			"Get/set typematic delays",
-			NULL);
+			"Get/set typematic delays");
 
 
 static int command_codeset(int argc, char **argv)
@@ -1010,8 +1009,7 @@ static int command_codeset(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(codeset, command_codeset,
 			"[set]",
-			"Get/set keyboard codeset",
-			NULL);
+			"Get/set keyboard codeset");
 
 
 static int command_controller_ram(int argc, char **argv)
@@ -1033,8 +1031,7 @@ static int command_controller_ram(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ctrlram, command_controller_ram,
 			"index [value]",
-			"Get/set keyboard controller RAM",
-			NULL);
+			"Get/set keyboard controller RAM");
 
 static int command_keyboard_log(int argc, char **argv)
 {
@@ -1080,8 +1077,7 @@ static int command_keyboard_log(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(kblog, command_keyboard_log,
 			"[on | off]",
-			"Print or toggle keyboard event log",
-			NULL);
+			"Print or toggle keyboard event log");
 
 
 static int command_keyboard(int argc, char **argv)
@@ -1100,8 +1096,7 @@ static int command_keyboard(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(kbd, command_keyboard,
 			"[0 | 1]",
-			"Print or toggle keyboard info",
-			NULL);
+			"Print or toggle keyboard info");
 
 
 static int command_8042_internal(int argc, char **argv)
@@ -1187,8 +1182,7 @@ static int command_8042(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(8042, command_8042,
 			"[internal | typematic | codeset | ctrlram |"
 			" kblog | kbd]",
-			"Print 8042 state in one place",
-			NULL);
+			"Print 8042 state in one place");
 #endif
 
 
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c
index 73a6e6fdaf..3ed60a27a7 100644
--- a/common/keyboard_scan.c
+++ b/common/keyboard_scan.c
@@ -808,8 +808,7 @@ static int command_ksstate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ksstate, command_ksstate,
 			"ksstate [on | off]",
-			"Show or toggle printing keyboard scan state",
-			NULL);
+			"Show or toggle printing keyboard scan state");
 
 static int command_keyboard_press(int argc, char **argv)
 {
@@ -854,6 +853,5 @@ static int command_keyboard_press(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(kbpress, command_keyboard_press,
 			"[col row [0 | 1]]",
-			"Simulate keypress",
-			NULL);
+			"Simulate keypress");
 #endif
diff --git a/common/lid_switch.c b/common/lid_switch.c
index e44925ee5a..eef4ccb045 100644
--- a/common/lid_switch.c
+++ b/common/lid_switch.c
@@ -123,8 +123,7 @@ static int command_lidopen(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(lidopen, command_lidopen,
 			NULL,
-			"Simulate lid open",
-			NULL);
+			"Simulate lid open");
 
 static int command_lidclose(int argc, char **argv)
 {
@@ -133,8 +132,7 @@ static int command_lidclose(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(lidclose, command_lidclose,
 			NULL,
-			"Simulate lid close",
-			NULL);
+			"Simulate lid close");
 
 static int command_lidstate(int argc, char **argv)
 {
@@ -144,8 +142,7 @@ static int command_lidstate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(lidstate, command_lidstate,
 			NULL,
-			"Get state of lid",
-			NULL);
+			"Get state of lid");
 
 /**
  * Host command to enable/disable lid opened.
diff --git a/common/lightbar.c b/common/lightbar.c
index 822cb77caf..9a01e64ccd 100644
--- a/common/lightbar.c
+++ b/common/lightbar.c
@@ -2073,5 +2073,4 @@ static int command_lightbar(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(lightbar, command_lightbar,
 			"[help | COMMAND [ARGS]]",
-			"Get/set lightbar state",
-			NULL);
+			"Get/set lightbar state");
diff --git a/common/memory_commands.c b/common/memory_commands.c
index da88c71a63..3cf7974e5e 100644
--- a/common/memory_commands.c
+++ b/common/memory_commands.c
@@ -108,8 +108,7 @@ static int command_mem_dump(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(md, command_mem_dump,
 			"[.b|.h|.s] addr [count]",
-			"dump memory values, optionally specifying the format",
-			NULL);
+			"dump memory values, optionally specifying the format");
 #endif /* CONFIG_CMD_MD */
 
 static int command_read_word(int argc, char **argv)
@@ -191,5 +190,4 @@ static int command_read_word(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND
 	(rw, command_read_word,
 	 "[.b|.h] addr [value]",
-	 "Read or write a word in memory optionally specifying the size",
-	 NULL);
+	 "Read or write a word in memory optionally specifying the size");
diff --git a/common/motion_sense.c b/common/motion_sense.c
index da9e10d7e5..678c02fe6f 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -1263,7 +1263,7 @@ static int command_accelrange(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(accelrange, command_accelrange,
 	"id [data [roundup]]",
-	"Read or write accelerometer range", NULL);
+	"Read or write accelerometer range");
 
 static int command_accelresolution(int argc, char **argv)
 {
@@ -1310,7 +1310,7 @@ static int command_accelresolution(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(accelres, command_accelresolution,
 	"id [data [roundup]]",
-	"Read or write accelerometer resolution", NULL);
+	"Read or write accelerometer resolution");
 
 static int command_accel_data_rate(int argc, char **argv)
 {
@@ -1369,7 +1369,7 @@ static int command_accel_data_rate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(accelrate, command_accel_data_rate,
 	"id [data [roundup]]",
-	"Read or write accelerometer ODR", NULL);
+	"Read or write accelerometer ODR");
 
 static int command_accel_read_xyz(int argc, char **argv)
 {
@@ -1408,7 +1408,7 @@ static int command_accel_read_xyz(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(accelread, command_accel_read_xyz,
 	"id [n]",
-	"Read sensor x/y/z", NULL);
+	"Read sensor x/y/z");
 
 static int command_accel_init(int argc, char **argv)
 {
@@ -1433,7 +1433,7 @@ static int command_accel_init(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(accelinit, command_accel_init,
 	"id",
-	"Init sensor", NULL);
+	"Init sensor");
 
 #ifdef CONFIG_CMD_ACCEL_INFO
 static int command_display_accel_info(int argc, char **argv)
@@ -1472,7 +1472,7 @@ static int command_display_accel_info(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(accelinfo, command_display_accel_info,
 	"on/off [interval]",
 	"Print motion sensor info, lid angle calculations"
-	" and set calculation frequency.", NULL);
+	" and set calculation frequency.");
 #endif /* CONFIG_CMD_ACCEL_INFO */
 
 #ifdef CONFIG_ACCEL_INTERRUPTS
@@ -1522,7 +1522,7 @@ static int command_accelerometer_interrupt(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(accelint, command_accelerometer_interrupt,
 	"id threshold",
-	"Write interrupt threshold", NULL);
+	"Write interrupt threshold");
 #endif /* CONFIG_ACCEL_INTERRUPTS */
 
 #ifdef CONFIG_ACCEL_FIFO
@@ -1555,7 +1555,7 @@ static int motion_sense_read_fifo(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fiforead, motion_sense_read_fifo,
 	"id",
-	"Read Fifo sensor", NULL);
+	"Read Fifo sensor");
 #endif
 
 #endif /* CONFIG_CMD_ACCELS */
diff --git a/common/panic_output.c b/common/panic_output.c
index ec80d6f4e9..bfd7f7a51f 100644
--- a/common/panic_output.c
+++ b/common/panic_output.c
@@ -199,8 +199,7 @@ DECLARE_CONSOLE_COMMAND(crash, command_crash,
 			" | stack"
 #endif
 			" | unaligned | watchdog | hang]",
-		"Crash the system (for testing)",
-		NULL);
+		"Crash the system (for testing)");
 #endif
 
 static int command_panicinfo(int argc, char **argv)
@@ -221,8 +220,7 @@ static int command_panicinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(panicinfo, command_panicinfo,
 			NULL,
-			"Print info from a previous panic",
-			NULL);
+			"Print info from a previous panic");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/port80.c b/common/port80.c
index fb2a8160bc..a3de63bc79 100644
--- a/common/port80.c
+++ b/common/port80.c
@@ -117,8 +117,7 @@ static int command_port80(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(port80, command_port80,
 			"[scroll | intprint | flush]",
-			"Print port80 writes or toggle port80 scrolling",
-			NULL);
+			"Print port80 writes or toggle port80 scrolling");
 
 int port80_last_boot(struct host_cmd_handler_args *args)
 {
diff --git a/common/power_button.c b/common/power_button.c
index 747be2381e..a5da582afd 100644
--- a/common/power_button.c
+++ b/common/power_button.c
@@ -190,6 +190,5 @@ static int command_powerbtn(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerbtn, command_powerbtn,
 			"[msec]",
-			"Simulate power button press",
-			NULL);
+			"Simulate power button press");
 
diff --git a/common/pwm.c b/common/pwm.c
index 84e242abf4..c7fb627ec7 100644
--- a/common/pwm.c
+++ b/common/pwm.c
@@ -137,8 +137,7 @@ static int cc_pwm_duty(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pwmduty, cc_pwm_duty,
 			"[channel [<percent> | -1=disable]]",
-			"Get/set PWM duty cycles ",
-			NULL);
+			"Get/set PWM duty cycles ");
 #endif /* CONFIG_PWM */
 
 /* Initialize all PWM pins as functional */
diff --git a/common/pwm_kblight.c b/common/pwm_kblight.c
index 15a2feb2bc..13415b5c51 100644
--- a/common/pwm_kblight.c
+++ b/common/pwm_kblight.c
@@ -41,8 +41,7 @@ static int command_kblight(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(kblight, command_kblight,
 			"percent",
-			"Set keyboard backlight",
-			NULL);
+			"Set keyboard backlight");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/shared_mem.c b/common/shared_mem.c
index 4060b68a58..adcc577696 100644
--- a/common/shared_mem.c
+++ b/common/shared_mem.c
@@ -62,6 +62,5 @@ static int command_shmem(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(shmem, command_shmem,
 			NULL,
-			"Print shared memory stats",
-			NULL);
+			"Print shared memory stats");
 #endif
diff --git a/common/spi_commands.c b/common/spi_commands.c
index 46ce27ce92..9fdc721d40 100644
--- a/common/spi_commands.c
+++ b/common/spi_commands.c
@@ -67,6 +67,5 @@ static int command_spixfer(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spixfer, command_spixfer,
 			"rlen/w id offset [value | len]",
-			"Read write spi. id is spi_devices array index",
-			NULL);
+			"Read write spi. id is spi_devices array index");
 
diff --git a/common/spi_flash.c b/common/spi_flash.c
index 860f799d37..2b2e821e71 100644
--- a/common/spi_flash.c
+++ b/common/spi_flash.c
@@ -490,8 +490,7 @@ static int command_spi_flashinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flashinfo, command_spi_flashinfo,
 	NULL,
-	"Print SPI flash info",
-	NULL);
+	"Print SPI flash info");
 
 #ifdef CONFIG_CMD_SPI_FLASH
 static int command_spi_flasherase(int argc, char **argv)
@@ -514,8 +513,7 @@ static int command_spi_flasherase(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flasherase, command_spi_flasherase,
 	"offset [bytes]",
-	"Erase flash",
-	NULL);
+	"Erase flash");
 
 static int command_spi_flashwrite(int argc, char **argv)
 {
@@ -560,8 +558,7 @@ static int command_spi_flashwrite(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flashwrite, command_spi_flashwrite,
 	"offset [bytes]",
-	"Write pattern to flash",
-	NULL);
+	"Write pattern to flash");
 
 static int command_spi_flashread(int argc, char **argv)
 {
@@ -619,8 +616,7 @@ static int command_spi_flashread(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flashread, command_spi_flashread,
 	"offset bytes",
-	"Read flash",
-	NULL);
+	"Read flash");
 
 static int command_spi_flashread_sr(int argc, char **argv)
 {
@@ -633,8 +629,7 @@ static int command_spi_flashread_sr(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flash_rsr, command_spi_flashread_sr,
 	NULL,
-	"Read status registers",
-	NULL);
+	"Read status registers");
 
 static int command_spi_flashwrite_sr(int argc, char **argv)
 {
@@ -653,8 +648,7 @@ static int command_spi_flashwrite_sr(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flash_wsr, command_spi_flashwrite_sr,
 	"value1 value2",
-	"Write to status registers",
-	NULL);
+	"Write to status registers");
 
 static int command_spi_flashprotect(int argc, char **argv)
 {
@@ -672,6 +666,5 @@ static int command_spi_flashprotect(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spi_flash_prot, command_spi_flashprotect,
 	"offset len",
-	"Set block protection",
-	NULL);
+	"Set block protection");
 #endif
diff --git a/common/spi_nor.c b/common/spi_nor.c
index 28ca4899c2..9c0bec9523 100644
--- a/common/spi_nor.c
+++ b/common/spi_nor.c
@@ -786,8 +786,7 @@ static int command_spi_nor_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spinorinfo, command_spi_nor_info,
 			"[device]",
-			"Report Serial NOR Flash device information",
-			NULL);
+			"Report Serial NOR Flash device information");
 #endif  /* CONFIG_CMD_SPI_NOR */
 
 #ifdef CONFIG_CMD_SPI_NOR
@@ -817,8 +816,7 @@ static int command_spi_nor_erase(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spinorerase, command_spi_nor_erase,
 			"device [offset] [size]",
-			"Erase flash",
-			NULL);
+			"Erase flash");
 #endif  /* CONFIG_CMD_SPI_NOR */
 
 #ifdef CONFIG_CMD_SPI_NOR
@@ -869,8 +867,7 @@ static int command_spi_nor_write(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spinorwrite, command_spi_nor_write,
 			"device [offset] [size]",
-			"Write pattern to flash",
-			NULL);
+			"Write pattern to flash");
 #endif  /* CONFIG_CMD_SPI_NOR */
 
 #ifdef CONFIG_CMD_SPI_NOR
@@ -933,6 +930,5 @@ err_free:
 }
 DECLARE_CONSOLE_COMMAND(spinorread, command_spi_nor_read,
 			"device [offset] [size]",
-			"Read flash",
-			NULL);
+			"Read flash");
 #endif  /* CONFIG_CMD_SPI_NOR */
diff --git a/common/switch.c b/common/switch.c
index 811e4f7d2d..ab5c971ff7 100644
--- a/common/switch.c
+++ b/common/switch.c
@@ -123,6 +123,5 @@ static int command_mmapinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(mmapinfo, command_mmapinfo,
 			NULL,
-			"Print memmap switch state",
-			NULL);
+			"Print memmap switch state");
 
diff --git a/common/system.c b/common/system.c
index 6ef35be808..21458a432f 100644
--- a/common/system.c
+++ b/common/system.c
@@ -847,8 +847,7 @@ static int command_sysinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(sysinfo, command_sysinfo,
 			NULL,
-			"Print system info",
-			NULL);
+			"Print system info");
 
 #ifdef CONFIG_CMD_SCRATCHPAD
 static int command_scratchpad(int argc, char **argv)
@@ -868,8 +867,7 @@ static int command_scratchpad(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(scratchpad, command_scratchpad,
 			"[val]",
-			"Get or set scratchpad value",
-			NULL);
+			"Get or set scratchpad value");
 #endif /* CONFIG_CMD_SCRATCHPAD */
 
 #ifdef CONFIG_HIBERNATE
@@ -894,8 +892,7 @@ static int command_hibernate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hibernate, command_hibernate,
 			"[sec] [usec]",
-			"Hibernate the EC",
-			NULL);
+			"Hibernate the EC");
 #endif /* CONFIG_HIBERNATE */
 
 /*
@@ -996,8 +993,7 @@ static int command_version(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(version, command_version,
 			NULL,
-			"Print versions",
-			NULL);
+			"Print versions");
 
 static int command_sysjump(int argc, char **argv)
 {
@@ -1037,8 +1033,7 @@ static int command_sysjump(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(sysjump, command_sysjump,
 			"[RO | RW | addr | disable]",
-			"Jump to a system image or address",
-			NULL);
+			"Jump to a system image or address");
 
 static int command_reboot(int argc, char **argv)
 {
@@ -1072,8 +1067,7 @@ static int command_reboot(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(reboot, command_reboot,
 			"[hard|soft] [preserve] [ap-off] [cancel]",
-			"Reboot the EC",
-			NULL);
+			"Reboot the EC");
 
 static int command_system_lock(int argc, char **argv)
 {
@@ -1082,8 +1076,7 @@ static int command_system_lock(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(syslock, command_system_lock,
 			NULL,
-			"Lock the system, even if WP is disabled",
-			NULL);
+			"Lock the system, even if WP is disabled");
 
 #ifdef CONFIG_LOW_POWER_IDLE
 /**
@@ -1117,8 +1110,7 @@ static int command_sleepmask(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(sleepmask, command_sleepmask,
 			"[ on | off | <sleep_mask>]",
-			"Display/force sleep mask.\nSee also 'dsleepmask'.",
-			NULL);
+			"Display/force sleep mask.\nSee also 'dsleepmask'.");
 #endif
 
 #ifdef CONFIG_CMD_JUMPTAGS
@@ -1146,8 +1138,7 @@ static int command_jumptags(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(jumptags, command_jumptags,
 			NULL,
-			"List jump tags",
-			NULL);
+			"List jump tags");
 #endif /* CONFIG_CMD_JUMPTAGS */
 
 /*****************************************************************************/
diff --git a/common/temp_sensor.c b/common/temp_sensor.c
index 7586fa9945..1ed5e5e518 100644
--- a/common/temp_sensor.c
+++ b/common/temp_sensor.c
@@ -137,8 +137,7 @@ static int command_temps(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(temps, command_temps,
 			NULL,
-			"Print temp sensors",
-			NULL);
+			"Print temp sensors");
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/test_util.c b/common/test_util.c
index fc9ce64a60..92c41d52d4 100644
--- a/common/test_util.c
+++ b/common/test_util.c
@@ -193,4 +193,4 @@ static int command_run_test(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(runtest, command_run_test,
-			NULL, NULL, NULL);
+			NULL, NULL);
diff --git a/common/thermal.c b/common/thermal.c
index d8a0ba52de..bd9ed7fbf0 100644
--- a/common/thermal.c
+++ b/common/thermal.c
@@ -200,8 +200,7 @@ static int command_thermalget(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(thermalget, command_thermalget,
 			NULL,
-			"Print thermal parameters (degrees Kelvin)",
-			NULL);
+			"Print thermal parameters (degrees Kelvin)");
 
 
 static int command_thermalset(int argc, char **argv)
@@ -248,8 +247,7 @@ static int command_thermalset(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(thermalset, command_thermalset,
 			"sensor warn [high [shutdown [fan_off [fan_max]]]]",
 			"Set thermal parameters (degrees Kelvin)."
-			" Use -1 to skip.",
-			NULL);
+			" Use -1 to skip.");
 
 /*****************************************************************************/
 /* Host commands. We'll reuse the host command number, but this is version 1,
diff --git a/common/throttle_ap.c b/common/throttle_ap.c
index c9d1029c65..ef11302881 100644
--- a/common/throttle_ap.c
+++ b/common/throttle_ap.c
@@ -91,6 +91,5 @@ static int command_apthrottle(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(apthrottle, command_apthrottle,
 			NULL,
-			"Display the AP throttling state",
-			NULL);
+			"Display the AP throttling state");
 #endif
diff --git a/common/timer.c b/common/timer.c
index b1f452f611..1648a9aeaa 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -270,8 +270,7 @@ static int command_wait(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(waitms, command_wait,
 			"msec",
-			"Busy-wait for msec",
-			NULL);
+			"Busy-wait for msec");
 
 #ifdef CONFIG_CMD_FORCETIME
 static int command_force_time(int argc, char **argv)
@@ -297,8 +296,7 @@ static int command_force_time(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(forcetime, command_force_time,
 			"hi lo",
-			"Force current time",
-			NULL);
+			"Force current time");
 #endif
 
 static int command_get_time(int argc, char **argv)
@@ -310,8 +308,7 @@ static int command_get_time(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(gettime, command_get_time,
 			NULL,
-			"Print current time",
-			NULL);
+			"Print current time");
 
 #ifdef CONFIG_CMD_TIMERINFO
 int command_timer_info(int argc, char **argv)
@@ -322,6 +319,5 @@ int command_timer_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(timerinfo, command_timer_info,
 			NULL,
-			"Print timer info",
-			NULL);
+			"Print timer info");
 #endif
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 074d07dc00..57b4b64340 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -599,8 +599,7 @@ static int command_pe(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(pe, command_pe,
 			"<port> dump",
-			"USB PE",
-			NULL);
+			"USB PE");
 #endif /* CONFIG_CMD_USB_PD_PE */
 
 #endif /* CONFIG_USB_PD_ALT_MODE_DFP */
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index ca2588517f..2f07d292e0 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -3162,8 +3162,7 @@ DECLARE_CONSOLE_COMMAND(pd, command_pd,
 			"[tx|bist_rx|bist_tx|charger|clock|dev"
 			"|soft|hash|hard|ping|state|swap [power|data]|"
 			"vdm [ping | curr | vers]]",
-			"USB PD",
-			NULL);
+			"USB PD");
 
 #ifdef HAS_TASK_HOSTCMD
 
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c
index 644f27dcd1..8620138a64 100644
--- a/common/usb_pd_tcpc.c
+++ b/common/usb_pd_tcpc.c
@@ -1362,6 +1362,5 @@ static int command_tcpc(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(tcpc, command_tcpc,
 			"dump [0|1]\n\t<port> [clock|state]",
-			"Type-C Port Controller",
-			NULL);
+			"Type-C Port Controller");
 #endif
diff --git a/common/usb_port_power_dumb.c b/common/usb_port_power_dumb.c
index feea23ed0a..2db167fceb 100644
--- a/common/usb_port_power_dumb.c
+++ b/common/usb_port_power_dumb.c
@@ -117,8 +117,7 @@ static int command_set_mode(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(usbchargemode, command_set_mode,
 			"[<port> <on | off>]",
-			"Set USB charge mode",
-			NULL);
+			"Set USB charge mode");
 
 
 /*****************************************************************************/
diff --git a/common/usb_port_power_smart.c b/common/usb_port_power_smart.c
index 5bd9b7b348..2c1da62f03 100644
--- a/common/usb_port_power_smart.c
+++ b/common/usb_port_power_smart.c
@@ -178,11 +178,14 @@ static int command_set_mode(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(usbchargemode, command_set_mode,
 			"[<port> <0 | 1 | 2 | 3>]",
-			"Set USB charge mode",
-			"Modes: 0=Disabled.\n"
-			"       1=Standard downstream port.\n"
-			"	2=Charging downstream port, BC 1.2.\n"
-			"       3=Dedicated charging port, BC 1.2.\n");
+			"Set USB charge mode");
+/*
+ * Modes:
+ * 0=Disabled.
+ * 1=Standard downstream port.
+ * 2=Charging downstream port, BC 1.2.
+ * 3=Dedicated charging port, BC 1.2.
+ */
 
 /*****************************************************************************/
 /* Host commands */
diff --git a/common/vboot_hash.c b/common/vboot_hash.c
index 0a70b006b9..8de7d8931e 100644
--- a/common/vboot_hash.c
+++ b/common/vboot_hash.c
@@ -328,8 +328,7 @@ static int command_hash(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hash, command_hash,
 			"[abort | ro | rw] | [<offset> <size> [<nonce>]]",
-			"Request hash recomputation",
-			NULL);
+			"Request hash recomputation");
 #endif /* CONFIG_CMD_HASH */
 /****************************************************************************/
 /* Host commands */
diff --git a/common/wireless.c b/common/wireless.c
index 4b420d9dde..a4c6e7fbdb 100644
--- a/common/wireless.c
+++ b/common/wireless.c
@@ -166,5 +166,4 @@ static int command_wireless(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(wireless, command_wireless,
 			"[now [suspend]]",
-			"Get/set wireless flags",
-			NULL);
+			"Get/set wireless flags");