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>
author: Bill Richardson <wfrichar@chromium.org> 2016-08-22 17:55:12 -0700
committer: Bill Richardson <wfrichar@chromium.org> 2016-08-24 16:30:10 +0000
commit: bb15561db56728b83ee7fe35e534da7577a7729d (patch)
tree: e586ee3b18c8fda464da38b42a06845f0d7f6786
parent: f322e32a3ec052be3f0c226145448fed63aa7ef9 (diff)
download: chrome-ec-bb15561db56728b83ee7fe35e534da7577a7729d.tar.gz
138 files changed, 270 insertions, 473 deletions
diff --git a/board/cr50/rdd.c b/board/cr50/rdd.c
index 608a025006..4d0fa942e8 100644
--- a/board/cr50/rdd.c
+++ b/board/cr50/rdd.c
@@ -160,6 +160,5 @@ static int command_ccd(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(ccd, command_ccd,
-	"[uart] [<BOOLEAN>]",
-	"Get/set the case closed debug state",
-	NULL);
+			"[uart] [<BOOLEAN>]",
+			"Get/set the case closed debug state");
diff --git a/board/cr50/wp.c b/board/cr50/wp.c
index e32ce2189a..ecead90bb1 100644
--- a/board/cr50/wp.c
+++ b/board/cr50/wp.c
@@ -27,6 +27,5 @@ static int command_wp(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(wp, command_wp,
-	"[bool]",
-	"Get/set the flash HW write-protect signal",
-	NULL);
+			"[<BOOLEAN>]",
+			"Get/set the flash HW write-protect signal");
diff --git a/board/elm/board.c b/board/elm/board.c
index de8142080f..a7562d9bb1 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -234,8 +234,7 @@ int command_pd_reset(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(resetpd, command_pd_reset,
 			"",
-			"Reset PD IC",
-			NULL);
+			"Reset PD IC");
 
 /**
  * There is a level shift for AC_OK & LID_OPEN signal between AP & EC,
diff --git a/board/glados/battery.c b/board/glados/battery.c
index 4c819dac48..2372affb64 100644
--- a/board/glados/battery.c
+++ b/board/glados/battery.c
@@ -225,7 +225,6 @@ static int command_fastcharge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile",
-			NULL);
+			"Get or set fast charging profile");
 
 #endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */
diff --git a/board/glados_pd/board.c b/board/glados_pd/board.c
index 930f3eb66d..ba46c59b78 100644
--- a/board/glados_pd/board.c
+++ b/board/glados_pd/board.c
@@ -124,8 +124,7 @@ static int command_ec_int(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ecint, command_ec_int,
 			"",
-			"Toggle EC interrupt line",
-			NULL);
+			"Toggle EC interrupt line");
 
 static int ec_status_host_cmd(struct host_cmd_handler_args *args)
 {
diff --git a/board/honeybuns/hx3.c b/board/honeybuns/hx3.c
index fe6de3c1f4..c5258632f3 100644
--- a/board/honeybuns/hx3.c
+++ b/board/honeybuns/hx3.c
@@ -139,5 +139,4 @@ static int command_hx3(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hx3, command_hx3,
 			"",
-			"Reset and Send HX3 Hub settings over I2C",
-			NULL);
+			"Reset and Send HX3 Hub settings over I2C");
diff --git a/board/kevin/led_kevin.c b/board/kevin/led_kevin.c
index fbd80edbf1..21c1d0fe95 100644
--- a/board/kevin/led_kevin.c
+++ b/board/kevin/led_kevin.c
@@ -165,5 +165,4 @@ static int command_led_color(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ledcolor, command_led_color,
 			"[debug|red|green|blue|off]",
-			"Change LED color",
-			NULL);
+			"Change LED color");
diff --git a/board/lucid/battery.c b/board/lucid/battery.c
index 7dc3872dff..d5d6a29dba 100644
--- a/board/lucid/battery.c
+++ b/board/lucid/battery.c
@@ -197,7 +197,6 @@ static int command_fastcharge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile",
-			NULL);
+			"Get or set fast charging profile");
 
 #endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */
diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c
index bf0445e316..73add50ca4 100644
--- a/board/pdeval-stm32f072/usb_pd_policy.c
+++ b/board/pdeval-stm32f072/usb_pd_policy.c
@@ -98,8 +98,7 @@ static int command_vbus_toggle(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(vbus, command_vbus_toggle,
 			"",
-			"Toggle VBUS detected",
-			NULL);
+			"Toggle VBUS detected");
 
 int pd_snk_is_vbus_provided(int port)
 {
diff --git a/board/plankton/board.c b/board/plankton/board.c
index 8f56422ba1..5bc6b776a3 100644
--- a/board/plankton/board.c
+++ b/board/plankton/board.c
@@ -586,8 +586,7 @@ static int cmd_usbc_action(int argc, char *argv[])
 }
 DECLARE_CONSOLE_COMMAND(usbc_action, cmd_usbc_action,
 			"<5v|12v|20v|ccd|dev|usb|dp|flip|pol0|pol1|drp>",
-			"Set Plankton type-C port state",
-			NULL);
+			"Set Plankton type-C port state");
 
 int board_in_hub_mode(void)
 {
@@ -628,7 +627,7 @@ static int cmd_usb_hub_reset(int argc, char *argv[])
 	return board_usb_hub_reset();
 }
 DECLARE_CONSOLE_COMMAND(hub_reset, cmd_usb_hub_reset,
-			NULL, "Reset USB hub", NULL);
+			NULL, "Reset USB hub");
 
 static void board_usb_hub_reset_no_return(void)
 {
@@ -771,7 +770,7 @@ static int cmd_fake_disconnect(int argc, char *argv[])
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(fakedisconnect, cmd_fake_disconnect,
-			"<delay_ms> <duration_ms>", NULL, NULL);
+			"<delay_ms> <duration_ms>", NULL);
 
 static void trigger_dfu_release(void)
 {
@@ -789,4 +788,4 @@ static int cmd_trigger_dfu(int argc, char *argv[])
 	hook_call_deferred(&trigger_dfu_release_data, 1500 * MSEC);
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(dfu, cmd_trigger_dfu, NULL, NULL, NULL);
+DECLARE_CONSOLE_COMMAND(dfu, cmd_trigger_dfu, NULL, NULL);
diff --git a/board/reef/battery.c b/board/reef/battery.c
index 850fc1a571..f0f7048296 100644
--- a/board/reef/battery.c
+++ b/board/reef/battery.c
@@ -295,7 +295,7 @@ static int command_fastcharge(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile", NULL);
+			"Get or set fast charging profile");
 
 #endif				/* CONFIG_CHARGER_PROFILE_OVERRIDE */
 
diff --git a/board/ryu/battery.c b/board/ryu/battery.c
index a7ecd3ea07..aab3f67291 100644
--- a/board/ryu/battery.c
+++ b/board/ryu/battery.c
@@ -219,8 +219,7 @@ static int command_fastcharge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile",
-			NULL);
+			"Get or set fast charging profile");
 #endif  /* CONFIG_CMD_FASTCHARGE */
 
 #endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */
diff --git a/board/ryu/board.c b/board/ryu/board.c
index 0c570a4d2d..f860ba057b 100644
--- a/board/ryu/board.c
+++ b/board/ryu/board.c
@@ -744,5 +744,4 @@ static int cmd_btn_press(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(btnpress, cmd_btn_press,
 			"<volup|voldown> [0|1]",
-			"Simulate button press",
-			NULL);
+			"Simulate button press");
diff --git a/board/samus/battery.c b/board/samus/battery.c
index bd334d08c8..ad2c2723ea 100644
--- a/board/samus/battery.c
+++ b/board/samus/battery.c
@@ -220,8 +220,7 @@ static int command_fastcharge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile",
-			NULL);
+			"Get or set fast charging profile");
 #endif  /* CONFIG_CMD_FASTCHARGE */
 
 #endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */
diff --git a/board/samus/extpower.c b/board/samus/extpower.c
index e54cb52a80..513bed48cd 100644
--- a/board/samus/extpower.c
+++ b/board/samus/extpower.c
@@ -435,5 +435,4 @@ static int command_backboost_det(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(bkboost, command_backboost_det, NULL,
-			"Read backboost detection",
-			NULL);
+			"Read backboost detection");
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index de4a46729a..e535881c53 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -537,8 +537,7 @@ static int command_ec_int(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ecint, command_ec_int,
 			"",
-			"Toggle EC interrupt line",
-			NULL);
+			"Toggle EC interrupt line");
 
 static int command_pd_host_event(int argc, char **argv)
 {
@@ -558,8 +557,7 @@ static int command_pd_host_event(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pdevent, command_pd_host_event,
 			"event_mask",
-			"Send PD host event",
-			NULL);
+			"Send PD host event");
 
 /****************************************************************************/
 /* Host commands */
diff --git a/board/strago/led.c b/board/strago/led.c
index 3549e09c11..cb0c0c313f 100644
--- a/board/strago/led.c
+++ b/board/strago/led.c
@@ -202,6 +202,5 @@ static int command_led_color(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ledcolor, command_led_color,
 			"[debug|red|green|amber|off]",
-			"Change LED color",
-			NULL);
+			"Change LED color");
 
diff --git a/board/twinkie/injector.c b/board/twinkie/injector.c
index 22031b9236..9b17180955 100644
--- a/board/twinkie/injector.c
+++ b/board/twinkie/injector.c
@@ -599,4 +599,4 @@ static int command_tw(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(twinkie, command_tw,
 			"[send|fsm|cc|resistor|txclock|rxthresh|vbus|vconn]",
-			"Manual Twinkie tweaking", NULL);
+			"Manual Twinkie tweaking");
diff --git a/board/twinkie/sniffer.c b/board/twinkie/sniffer.c
index 64e0060010..3c9f6fbd6a 100644
--- a/board/twinkie/sniffer.c
+++ b/board/twinkie/sniffer.c
@@ -549,4 +549,4 @@ static int command_sniffer(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(sniffer, command_sniffer,
-			"[]", "Buffering status", NULL);
+			"[]", "Buffering status");
diff --git a/board/wheatley/battery.c b/board/wheatley/battery.c
index 4c819dac48..2372affb64 100644
--- a/board/wheatley/battery.c
+++ b/board/wheatley/battery.c
@@ -225,7 +225,6 @@ static int command_fastcharge(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
 			"[on|off]",
-			"Get or set fast charging profile",
-			NULL);
+			"Get or set fast charging profile");
 
 #endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */
diff --git a/chip/g/gpio.c b/chip/g/gpio.c
index a6ec1bdcb9..5fd8ed0982 100644
--- a/chip/g/gpio.c
+++ b/chip/g/gpio.c
@@ -437,8 +437,7 @@ static int command_pinmux(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pinmux, command_pinmux,
 			"",
-			"Display pinmux info",
-			NULL);
+			"Display pinmux info");
 
 static const char * const int_str[] = {
 	"LOW", "FALLING", "HIGH", "RISING",
@@ -481,5 +480,4 @@ static int command_gpiocfg(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(gpiocfg, command_gpiocfg,
 			"",
-			"Display GPIO configs",
-			NULL);
+			"Display GPIO configs");
diff --git a/chip/g/idle.c b/chip/g/idle.c
index 88a2c14eaa..f34525d8db 100644
--- a/chip/g/idle.c
+++ b/chip/g/idle.c
@@ -50,8 +50,7 @@ static int command_idle(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idle, command_idle,
 			"[w|s|d]",
-			"Set or show the idle action: wfi, sleep, deep sleep",
-			NULL);
+			"Set or show the idle action: wfi, sleep, deep sleep");
 
 static int utmi_wakeup_is_enabled(void)
 {
diff --git a/chip/g/jitter.c b/chip/g/jitter.c
index 1dd938cbf3..3a485d3d84 100644
--- a/chip/g/jitter.c
+++ b/chip/g/jitter.c
@@ -218,6 +218,5 @@ static int command_sof(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(sof, command_sof,
 			"",
-			"Display the SoF clock stuff",
-			NULL);
+			"Display the SoF clock stuff");
 #endif	/* DEBUG_ME */
diff --git a/chip/g/rdd.c b/chip/g/rdd.c
index 7bcd172827..3ef9bf14c6 100644
--- a/chip/g/rdd.c
+++ b/chip/g/rdd.c
@@ -88,4 +88,4 @@ static int command_test_rdd(int argc, char **argv)
 	GWRITE_FIELD(RDD, INT_TEST, INTR_DEBUG_STATE_DETECTED, 1);
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(test_rdd, command_test_rdd, "", "", NULL);
+DECLARE_CONSOLE_COMMAND(test_rdd, command_test_rdd, "", "");
diff --git a/chip/g/sps.c b/chip/g/sps.c
index 923e39398c..a25e379bb6 100644
--- a/chip/g/sps.c
+++ b/chip/g/sps.c
@@ -520,6 +520,5 @@ static int command_sps(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(spstest, command_sps,
 			"<num of frames>",
-			"Loop back frames (10 by default) back to the host",
-			NULL);
+			"Loop back frames (10 by default) back to the host");
 #endif /* CONFIG_SPS_TEST */
diff --git a/chip/g/usb.c b/chip/g/usb.c
index 751b4b131d..e2d3e15177 100644
--- a/chip/g/usb.c
+++ b/chip/g/usb.c
@@ -1404,5 +1404,4 @@ static int command_usb(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(usb, command_usb,
 			"[<BOOLEAN> | a | b]",
-			"Get/set the USB connection state and PHY selection",
-			NULL);
+			"Get/set the USB connection state and PHY selection");
diff --git a/chip/g/usb_hid.c b/chip/g/usb_hid.c
index c00d3d20cb..11c82eacbf 100644
--- a/chip/g/usb_hid.c
+++ b/chip/g/usb_hid.c
@@ -155,5 +155,4 @@ static int command_hid(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hid, command_hid,
 			"[<HID keycode>]",
-			"test USB HID driver",
-			NULL);
+			"test USB HID driver");
diff --git a/chip/it83xx/clock.c b/chip/it83xx/clock.c
index a63a86ec0a..60549c81fe 100644
--- a/chip/it83xx/clock.c
+++ b/chip/it83xx/clock.c
@@ -438,8 +438,7 @@ static int command_idle_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
 			"",
-			"Print last idle stats",
-			NULL);
+			"Print last idle stats");
 
 /**
  * Configure deep sleep clock settings.
@@ -486,6 +485,5 @@ DECLARE_CONSOLE_COMMAND(dsleep, command_dsleep,
 		"Use 'off' to allow deep sleep to use heavysleep whenever\n"
 		"conditions allow.\n"
 		"Give a timeout value for the console in use timeout.\n"
-		"See also 'sleepmask'.",
-		NULL);
+		"See also 'sleepmask'.");
 #endif /* CONFIG_LOW_POWER_IDLE */
diff --git a/chip/it83xx/peci.c b/chip/it83xx/peci.c
index 7682ddbcfe..b8e0b7c451 100644
--- a/chip/it83xx/peci.c
+++ b/chip/it83xx/peci.c
@@ -403,8 +403,7 @@ static int peci_cmd(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(peci, peci_cmd,
 			"addr wlen rlen cmd timeout(us)",
-			"PECI command",
-			NULL);
+			"PECI command");
 
 static int command_peci_temp(int argc, char **argv)
 {
@@ -418,5 +417,4 @@ static int command_peci_temp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pecitemp, command_peci_temp,
 			NULL,
-			"Print CPU temperature",
-			NULL);
+			"Print CPU temperature");
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index f4ce1d6be9..64d6c09157 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -356,5 +356,4 @@ static int command_rw_ec_reg(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(rwreg, command_rw_ec_reg,
 			"addr [value (byte)]",
 			"R/W EC/PNPCFG registers."
-			" addr 0xec21xxyy for R/W PNPCFG, xx is LDN yy is IDX",
-			NULL);
+			" addr 0xec21xxyy for R/W PNPCFG, xx is LDN yy is IDX");
diff --git a/chip/lm4/adc.c b/chip/lm4/adc.c
index 82f28153e4..278908151c 100644
--- a/chip/lm4/adc.c
+++ b/chip/lm4/adc.c
@@ -214,8 +214,7 @@ static int command_ectemp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ectemp, command_ectemp,
 			NULL,
-			"Print EC temperature",
-			NULL);
+			"Print EC temperature");
 #endif
 
 /*****************************************************************************/
diff --git a/chip/lm4/clock.c b/chip/lm4/clock.c
index b8029f5d27..bc4b865403 100644
--- a/chip/lm4/clock.c
+++ b/chip/lm4/clock.c
@@ -551,8 +551,7 @@ static int command_sleep(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(sleep, command_sleep,
 			"[level [clock] [sram pm] [flash pm]]",
-			"Drop into sleep",
-			NULL);
+			"Drop into sleep");
 #endif /* CONFIG_CMD_SLEEP */
 
 #ifdef CONFIG_CMD_PLL
@@ -594,8 +593,7 @@ static int command_pll(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pll, command_pll,
 			"[ on | off | <div> ]",
-			"Get/set PLL state",
-			NULL);
+			"Get/set PLL state");
 
 #endif /* CONFIG_CMD_PLL */
 
@@ -681,8 +679,7 @@ static int command_clock_gating(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(clockgates, command_clock_gating,
 			"",
-			"Get state of the clock gating controls regs",
-			NULL);
+			"Get state of the clock gating controls regs");
 #endif /* CONFIG_CMD_CLOCKGATES */
 
 #ifdef CONFIG_LOW_POWER_IDLE
@@ -705,8 +702,7 @@ static int command_idle_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
 			"",
-			"Print last idle stats",
-			NULL);
+			"Print last idle stats");
 
 /**
  * Configure deep sleep clock settings.
@@ -753,7 +749,6 @@ DECLARE_CONSOLE_COMMAND(dsleep, command_dsleep,
 			"allow deep sleep to auto-select using the low speed "
 			"clock.\n"
 			"Give a timeout value for the console in use timeout.\n"
-			"See also 'sleepmask'.",
-			NULL);
+			"See also 'sleepmask'.");
 #endif /* CONFIG_LOW_POWER_IDLE */
 
diff --git a/chip/lm4/eeprom.c b/chip/lm4/eeprom.c
index b8c45c23e2..81fb47465d 100644
--- a/chip/lm4/eeprom.c
+++ b/chip/lm4/eeprom.c
@@ -146,8 +146,7 @@ static int command_eeprom_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(eeinfo, command_eeprom_info,
 			NULL,
-			"Print EEPROM info",
-			NULL);
+			"Print EEPROM info");
 
 
 static int command_eeprom_read(int argc, char **argv)
@@ -178,8 +177,7 @@ static int command_eeprom_read(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(eeread, command_eeprom_read,
 			"block [offset]",
-			"Read a word of EEPROM",
-			NULL);
+			"Read a word of EEPROM");
 
 
 static int command_eeprom_write(int argc, char **argv)
@@ -207,8 +205,7 @@ static int command_eeprom_write(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(eewrite, command_eeprom_write,
 			"block offset value",
-			"Write a word of EEPROM",
-			NULL);
+			"Write a word of EEPROM");
 
 
 #ifdef CONSOLE_COMMAND_EEHIDE
@@ -229,8 +226,7 @@ static int command_eeprom_hide(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(eehide, command_eeprom_hide,
 			"block",
-			"Hide a block of EEPROM",
-			NULL);
+			"Hide a block of EEPROM");
 #endif
 
 
diff --git a/chip/lm4/peci.c b/chip/lm4/peci.c
index 44c1699d26..70f65b5837 100644
--- a/chip/lm4/peci.c
+++ b/chip/lm4/peci.c
@@ -149,5 +149,4 @@ static int command_peci_temp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pecitemp, command_peci_temp,
 			NULL,
-			"Print CPU temperature",
-			NULL);
+			"Print CPU temperature");
diff --git a/chip/lm4/spi.c b/chip/lm4/spi.c
index 60394bb936..3fd3bc96de 100644
--- a/chip/lm4/spi.c
+++ b/chip/lm4/spi.c
@@ -184,5 +184,4 @@ static int command_spirom(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spirom, command_spirom,
 			NULL,
-			"Test reading SPI EEPROM",
-			NULL);
+			"Test reading SPI EEPROM");
diff --git a/chip/lm4/system.c b/chip/lm4/system.c
index 5fec905517..26cd0f2967 100644
--- a/chip/lm4/system.c
+++ b/chip/lm4/system.c
@@ -650,8 +650,7 @@ static int command_system_rtc(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(rtc, command_system_rtc,
 			"[set <seconds>]",
-			"Get/set real-time clock",
-			NULL);
+			"Get/set real-time clock");
 
 #ifdef CONFIG_CMD_RTC_ALARM
 /**
@@ -684,8 +683,7 @@ static int command_rtc_alarm_test(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(rtc_alarm, command_rtc_alarm_test,
 			"[seconds [microseconds]]",
-			"Test alarm",
-			NULL);
+			"Test alarm");
 #endif /* CONFIG_CMD_RTC_ALARM */
 #endif /* CONFIG_CMD_RTC */
 
diff --git a/chip/lm4/uart.c b/chip/lm4/uart.c
index 6ef44f8dc4..21fdf70ec9 100644
--- a/chip/lm4/uart.c
+++ b/chip/lm4/uart.c
@@ -347,7 +347,6 @@ static int command_comxtest(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(comxtest, command_comxtest,
 			"[string]",
-			"Write test data to COMx uart",
-			NULL);
+			"Write test data to COMx uart");
 
 #endif /* CONFIG_CMD_COMXTEST */
diff --git a/chip/mec1322/clock.c b/chip/mec1322/clock.c
index a49d2362aa..0fcb411d23 100644
--- a/chip/mec1322/clock.c
+++ b/chip/mec1322/clock.c
@@ -434,8 +434,7 @@ static int command_idle_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
 			"",
-			"Print last idle stats",
-			NULL);
+			"Print last idle stats");
 
 /**
  * Configure deep sleep clock settings.
@@ -481,6 +480,5 @@ DECLARE_CONSOLE_COMMAND(dsleep, command_dsleep,
 			"allow deep sleep to use heavysleep whenever conditions"
 			"allow.\n"
 			"Give a timeout value for the console in use timeout.\n"
-			"See also 'sleepmask'.",
-			NULL);
+			"See also 'sleepmask'.");
 #endif /* CONFIG_LOW_POWER_IDLE */
diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c
index df40f563a9..298a161762 100644
--- a/chip/mec1322/lpc.c
+++ b/chip/mec1322/lpc.c
@@ -598,7 +598,7 @@ static int lpc_command_init(int argc, char **argv)
 	lpc_init();
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(lpcinit, lpc_command_init, NULL, NULL, NULL);
+DECLARE_CONSOLE_COMMAND(lpcinit, lpc_command_init, NULL, NULL);
 
 /* Get protocol information */
 static int lpc_get_protocol_info(struct host_cmd_handler_args *args)
diff --git a/chip/npcx/clock.c b/chip/npcx/clock.c
index 05d49ae751..725473cccb 100644
--- a/chip/npcx/clock.c
+++ b/chip/npcx/clock.c
@@ -380,8 +380,7 @@ static int command_idle_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
 		"",
-		"Print last idle stats",
-		NULL);
+		"Print last idle stats");
 
 /**
  * Configure deep sleep clock settings.
@@ -428,6 +427,5 @@ DECLARE_CONSOLE_COMMAND(dsleep, command_dsleep,
 		"allow deep sleep to auto-select using the low speed "
 		"clock.\n"
 		"Give a timeout value for the console in use timeout.\n"
-		"See also 'sleepmask'.",
-		NULL);
+		"See also 'sleepmask'.");
 #endif /* CONFIG_LOW_POWER_IDLE */
diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c
index f998c7bb16..688030f948 100644
--- a/chip/npcx/espi.c
+++ b/chip/npcx/espi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -651,6 +651,5 @@ static int command_espi(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(espi, command_espi,
 			"cfg/vms/vsm/en/dis [channel]",
-			"eSPI configurations",
-			NULL);
+			"eSPI configurations");
 
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c
index e889163088..95b4796bb3 100644
--- a/chip/npcx/flash.c
+++ b/chip/npcx/flash.c
@@ -794,8 +794,7 @@ static int command_flash_spi_sel_lock(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flash_spi_lock, command_flash_spi_sel_lock,
 			"[0 | 1]",
-			"Lock spi flash interface selection",
-			NULL);
+			"Lock spi flash interface selection");
 
 static int command_flash_tristate(int argc, char **argv)
 {
@@ -812,6 +811,5 @@ static int command_flash_tristate(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(flash_tristate, command_flash_tristate,
 			"[0 | 1]",
-			"Tristate spi flash pins",
-			NULL);
+			"Tristate spi flash pins");
 
diff --git a/chip/npcx/peci.c b/chip/npcx/peci.c
index 4cb926ef18..48920cdea2 100644
--- a/chip/npcx/peci.c
+++ b/chip/npcx/peci.c
@@ -295,5 +295,4 @@ static int command_peci_temp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pecitemp, command_peci_temp,
 		NULL,
-		"Print CPU temperature",
-		NULL);
+		"Print CPU temperature");
diff --git a/chip/npcx/spi.c b/chip/npcx/spi.c
index 04a05e6942..790f4c1e47 100644
--- a/chip/npcx/spi.c
+++ b/chip/npcx/spi.c
@@ -260,6 +260,5 @@ static int command_spirom(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(spirom, command_spirom,
 		NULL,
-		"Test reading SPI EEPROM",
-		NULL);
+		"Test reading SPI EEPROM");
 #endif
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index ec0847cb34..f25bf35fca 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -757,8 +757,7 @@ static int command_system_rtc(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(rtc, command_system_rtc,
 		"[set <seconds>]",
-		"Get/set real-time clock",
-		NULL);
+		"Get/set real-time clock");
 
 #ifdef CONFIG_CMD_RTC_ALARM
 /**
@@ -791,8 +790,7 @@ static int command_rtc_alarm_test(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(rtc_alarm, command_rtc_alarm_test,
 		"[seconds [microseconds]]",
-		"Test alarm",
-		NULL);
+		"Test alarm");
 #endif /* CONFIG_CMD_RTC_ALARM */
 #endif /* CONFIG_CMD_RTC */
 
diff --git a/chip/nrf51/bluetooth_le.c b/chip/nrf51/bluetooth_le.c
index 831edd920c..7fe80ff8e1 100644
--- a/chip/nrf51/bluetooth_le.c
+++ b/chip/nrf51/bluetooth_le.c
@@ -469,8 +469,7 @@ static int command_ble_adv(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ble_adv, command_ble_adv,
 			"type len [reps] [interval = 100000 (100ms)]",
-			"Send a BLE packet of type type of length len",
-			NULL);
+			"Send a BLE packet of type type of length len");
 
 static int command_ble_adv_scan(int argc, char **argv)
 {
@@ -534,6 +533,5 @@ static int command_ble_adv_scan(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ble_scan, command_ble_adv_scan,
 			"chan [num] [addr0]",
-			"Scan for [num] BLE packets on channel chan",
-			NULL);
+			"Scan for [num] BLE packets on channel chan");
 
diff --git a/chip/stm32/clock-f.c b/chip/stm32/clock-f.c
index 02773dc678..1d28fa2168 100644
--- a/chip/stm32/clock-f.c
+++ b/chip/stm32/clock-f.c
@@ -203,7 +203,6 @@ static int command_rtc_alarm_test(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(rtc_alarm, command_rtc_alarm_test,
 			"[seconds [microseconds]]",
-			"Test alarm",
-			NULL);
+			"Test alarm");
 #endif /* CONFIG_CMD_RTC_ALARM */
 
diff --git a/chip/stm32/clock-stm32f0.c b/chip/stm32/clock-stm32f0.c
index 98c39694f2..b94641ef0a 100644
--- a/chip/stm32/clock-stm32f0.c
+++ b/chip/stm32/clock-stm32f0.c
@@ -412,7 +412,6 @@ static int command_idle_stats(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(idlestats, command_idle_stats,
 			"",
-			"Print last idle stats",
-			NULL);
+			"Print last idle stats");
 #endif /* CONFIG_CMD_IDLE_STATS */
 #endif
diff --git a/chip/stm32/clock-stm32l.c b/chip/stm32/clock-stm32l.c
index c8b8bc0683..709d53f902 100644
--- a/chip/stm32/clock-stm32l.c
+++ b/chip/stm32/clock-stm32l.c
@@ -373,5 +373,4 @@ static int command_clock(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(clock, command_clock,
 			"hsi | msi",
-			"Set clock frequency",
-			NULL);
+			"Set clock frequency");
diff --git a/chip/stm32/clock-stm32l4.c b/chip/stm32/clock-stm32l4.c
index 1e825e5c39..499c327baf 100644
--- a/chip/stm32/clock-stm32l4.c
+++ b/chip/stm32/clock-stm32l4.c
@@ -386,5 +386,4 @@ DECLARE_CONSOLE_COMMAND(clock, command_clock,
 			" | hse | pll"
 #endif
 			,
-			"Set clock frequency",
-			NULL);
+			"Set clock frequency");
diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c
index cdca08a25a..136a9413ac 100644
--- a/chip/stm32/i2c-stm32l.c
+++ b/chip/stm32/i2c-stm32l.c
@@ -419,5 +419,4 @@ static int command_i2cdump(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(i2cdump, command_i2cdump,
 			NULL,
-			"Dump I2C regs",
-			NULL);
+			"Dump I2C regs");
diff --git a/chip/stm32/power_led.c b/chip/stm32/power_led.c
index 03a7f33a82..c6d4665e84 100644
--- a/chip/stm32/power_led.c
+++ b/chip/stm32/power_led.c
@@ -158,6 +158,5 @@ static int command_powerled(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerled, command_powerled,
 		"[off | on | suspend]",
-		"Change power LED state",
-		NULL);
+		"Change power LED state");
 #endif
diff --git a/chip/stm32/usart_info_command.c b/chip/stm32/usart_info_command.c
index 836dc6d84c..f6a76d99f3 100644
--- a/chip/stm32/usart_info_command.c
+++ b/chip/stm32/usart_info_command.c
@@ -40,5 +40,4 @@ static int command_usart_info(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(usart_info,
 			command_usart_info,
 			NULL,
-			"Display USART info",
-			NULL);
+			"Display USART info");
diff --git a/chip/stm32/usb.c b/chip/stm32/usb.c
index 82b0926702..a3de00f53a 100644
--- a/chip/stm32/usb.c
+++ b/chip/stm32/usb.c
@@ -515,6 +515,5 @@ static int command_serialno(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(serialno, command_serialno,
 	"load/set [value]",
-	"Read and write USB serial number",
-	NULL);
+	"Read and write USB serial number");
 #endif
diff --git a/chip/stm32/usb_hid.c b/chip/stm32/usb_hid.c
index 1f01ec8dc8..ddf1c3ccec 100644
--- a/chip/stm32/usb_hid.c
+++ b/chip/stm32/usb_hid.c
@@ -160,5 +160,4 @@ static int command_hid(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hid, command_hid,
 			"[<HID keycode>]",
-			"test USB HID driver",
-			NULL);
+			"test USB HID driver");
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");
diff --git a/core/cortex-m/task.c b/core/cortex-m/task.c
index ae2882ac10..7b80c1584a 100644
--- a/core/cortex-m/task.c
+++ b/core/cortex-m/task.c
@@ -608,8 +608,7 @@ int command_task_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 			NULL,
-			"Print task info",
-			NULL);
+			"Print task info");
 
 #ifdef CONFIG_CMD_TASKREADY
 static int command_task_ready(int argc, char **argv)
@@ -626,8 +625,7 @@ static int command_task_ready(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskready, command_task_ready,
 			"[setmask]",
-			"Print/set ready tasks",
-			NULL);
+			"Print/set ready tasks");
 #endif
 
 void task_pre_init(void)
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 5d219a5149..b5f9aef40c 100644
--- a/core/cortex-m0/task.c
+++ b/core/cortex-m0/task.c
@@ -599,8 +599,7 @@ int command_task_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 			NULL,
-			"Print task info",
-			NULL);
+			"Print task info");
 
 #ifdef CONFIG_CMD_TASKREADY
 static int command_task_ready(int argc, char **argv)
@@ -617,8 +616,7 @@ static int command_task_ready(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskready, command_task_ready,
 			"[setmask]",
-			"Print/set ready tasks",
-			NULL);
+			"Print/set ready tasks");
 #endif
 
 void task_pre_init(void)
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 033cd1e5c0..fec005e0a0 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -574,8 +574,7 @@ int command_task_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 			NULL,
-			"Print task info",
-			NULL);
+			"Print task info");
 
 #ifdef CONFIG_CMD_TASKREADY
 static int command_task_ready(int argc, char **argv)
@@ -592,8 +591,7 @@ static int command_task_ready(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskready, command_task_ready,
 			"[setmask]",
-			"Print/set ready tasks",
-			NULL);
+			"Print/set ready tasks");
 #endif
 
 void task_pre_init(void)
diff --git a/core/nds32/task.c b/core/nds32/task.c
index f983962cff..dc83cba088 100644
--- a/core/nds32/task.c
+++ b/core/nds32/task.c
@@ -706,8 +706,7 @@ int command_task_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info,
 			NULL,
-			"Print task info",
-			NULL);
+			"Print task info");
 
 static int command_task_ready(int argc, char **argv)
 {
@@ -723,8 +722,7 @@ static int command_task_ready(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(taskready, command_task_ready,
 			"[setmask]",
-			"Print/set ready tasks",
-			NULL);
+			"Print/set ready tasks");
 
 void task_pre_init(void)
 {
diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c
index ae9f024cc2..760a367b9c 100644
--- a/driver/battery/bq27541.c
+++ b/driver/battery/bq27541.c
@@ -353,6 +353,5 @@ 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/driver/battery/bq27621_g1.c b/driver/battery/bq27621_g1.c
index e08e700522..c55d452c87 100644
--- a/driver/battery/bq27621_g1.c
+++ b/driver/battery/bq27621_g1.c
@@ -576,8 +576,7 @@ static int command_fgunseal(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgunseal, command_fgunseal,
 			"",
-			"Unseal the fg",
-			NULL);
+			"Unseal the fg");
 
 static int command_fgseal(int argc, char **argv)
 {
@@ -593,8 +592,7 @@ static int command_fgseal(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgseal, command_fgseal,
 			"",
-			"Seal the fg",
-			NULL);
+			"Seal the fg");
 
 static int command_fginit(int argc, char **argv)
 {
@@ -629,8 +627,7 @@ static int command_fginit(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fginit, command_fginit,
 			"[force]",
-			"Initialize the fg",
-			NULL);
+			"Initialize the fg");
 
 static int command_fgprobe(int argc, char **argv)
 {
@@ -646,8 +643,7 @@ static int command_fgprobe(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgprobe, command_fgprobe,
 			"",
-			"Probe the fg",
-			NULL);
+			"Probe the fg");
 
 static int command_fgrd(int argc, char **argv)
 {
@@ -681,8 +677,7 @@ static int command_fgrd(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgrd, command_fgrd,
 			"cmd len",
-			"Read _len_ words from the fg",
-			NULL);
+			"Read _len_ words from the fg");
 
 static int command_fgcmd(int argc, char **argv)
 {
@@ -718,8 +713,7 @@ static int command_fgcmd(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgcmd, command_fgcmd,
 			"cmd data [byte]",
-			"Send a cmd to the fg",
-			NULL);
+			"Send a cmd to the fg");
 
 static int command_fgcmdrd(int argc, char **argv)
 {
@@ -747,8 +741,7 @@ static int command_fgcmdrd(int argc, char **argv)
 
 DECLARE_CONSOLE_COMMAND(fgcmdrd, command_fgcmdrd,
 			"cmd data",
-			"Send a 2-byte cmd to the fg, read back the 2-byte result",
-			NULL);
+			"Send a 2-byte cmd to the fg, read back the 2-byte result");
 
 #endif /* CONFIG_CMD_BATDEBUG */
 
diff --git a/driver/battery/smart.c b/driver/battery/smart.c
index 6f884a55b3..ff2da13863 100644
--- a/driver/battery/smart.c
+++ b/driver/battery/smart.c
@@ -396,8 +396,7 @@ 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");
 #endif
 
 /*****************************************************************************/
diff --git a/driver/charger/bd99955.c b/driver/charger/bd99955.c
index 4aa4311cfb..c12b7949a5 100644
--- a/driver/charger/bd99955.c
+++ b/driver/charger/bd99955.c
@@ -956,8 +956,7 @@ static int console_bd99955_dump_regs(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(bd99955_dump, console_bd99955_dump_regs,
 			NULL,
-			"Dump all charger registers",
-			NULL);
+			"Dump all charger registers");
 
 static int console_command_bd99955(int argc, char **argv)
 {
@@ -1001,8 +1000,7 @@ static int console_command_bd99955(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(bd99955, console_command_bd99955,
 			"bd99955 <r/w> <reg_hex> <cmd_type> | <val_hex>",
-			"Read or write a charger register",
-			NULL);
+			"Read or write a charger register");
 #endif /* CONFIG_CMD_CHARGER */
 
 #ifdef CONFIG_CMD_CHARGER_PSYS
@@ -1068,8 +1066,7 @@ static int console_command_psys(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(psys, console_command_psys,
 			NULL,
-			"Get the system power in mW",
-			NULL);
+			"Get the system power in mW");
 #endif /* CONFIG_CMD_CHARGER_PSYS */
 
 #ifdef CONFIG_CMD_CHARGER_ADC_AMON_BMON
@@ -1160,6 +1157,5 @@ static int console_command_amon_bmon(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(amonbmon, console_command_amon_bmon,
 			"amonbmon [a|b]",
-			"Get charger AMON/BMON voltage diff, current",
-			NULL);
+			"Get charger AMON/BMON voltage diff, current");
 #endif /* CONFIG_CMD_CHARGER_ADC_AMON_BMON */
diff --git a/driver/charger/bq24192.c b/driver/charger/bq24192.c
index 2bc6697d6e..defc97115e 100644
--- a/driver/charger/bq24192.c
+++ b/driver/charger/bq24192.c
@@ -271,5 +271,5 @@ static int command_bq24192(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(bq24192, command_bq24192,
-			NULL, NULL, NULL);
+			NULL, NULL);
 #endif
diff --git a/driver/charger/bq2589x.c b/driver/charger/bq2589x.c
index e36007f16a..9586393c4c 100644
--- a/driver/charger/bq2589x.c
+++ b/driver/charger/bq2589x.c
@@ -388,5 +388,5 @@ static int command_bq2589x(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(bq2589x, command_bq2589x,
-			NULL, NULL, NULL);
+			NULL, NULL);
 #endif
diff --git a/driver/charger/isl9237.c b/driver/charger/isl9237.c
index 94b8669ce6..3be623ff00 100644
--- a/driver/charger/isl9237.c
+++ b/driver/charger/isl9237.c
@@ -412,8 +412,7 @@ static int console_command_psys(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(psys, console_command_psys,
 			NULL,
-			"Get the system power in mW",
-			NULL);
+			"Get the system power in mW");
 #endif /* CONFIG_CMD_CHARGER_PSYS */
 #endif /* CONFIG_CHARGER_PSYS */
 
@@ -462,6 +461,5 @@ static int console_command_amon_bmon(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(amonbmon, console_command_amon_bmon,
 			"amonbmon [a|b]",
-			"Get charger AMON/BMON voltage diff, current",
-			NULL);
+			"Get charger AMON/BMON voltage diff, current");
 #endif /* CONFIG_CMD_CHARGER_ADC_AMON_BMON */
diff --git a/driver/ina2xx.c b/driver/ina2xx.c
index 34a928fb33..d610285710 100644
--- a/driver/ina2xx.c
+++ b/driver/ina2xx.c
@@ -143,6 +143,5 @@ static int command_ina(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ina, command_ina,
 			"<index> [config|calib|mask|alert <val>]",
-			"INA2XX power/current sensing",
-			NULL);
+			"INA2XX power/current sensing");
 #endif
diff --git a/driver/led/ds2413.c b/driver/led/ds2413.c
index 8364688e28..0ba713f27f 100644
--- a/driver/led/ds2413.c
+++ b/driver/led/ds2413.c
@@ -162,6 +162,5 @@ static int command_powerled(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerled, command_powerled,
 			"<off | red | yellow | green>",
-			"Set power LED color",
-			NULL);
+			"Set power LED color");
 #endif
diff --git a/driver/led/lp5562.c b/driver/led/lp5562.c
index 669057b728..88efb72e7b 100644
--- a/driver/led/lp5562.c
+++ b/driver/led/lp5562.c
@@ -156,6 +156,5 @@ static int command_lp5562(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(lp5562, command_lp5562,
 			"on | off | <red> <green> <blue>",
-			"Set the color of the LED",
-			NULL);
+			"Set the color of the LED");
 #endif
diff --git a/driver/mcdp28x0.c b/driver/mcdp28x0.c
index 0a39e5e225..3af0eec0c9 100644
--- a/driver/mcdp28x0.c
+++ b/driver/mcdp28x0.c
@@ -309,6 +309,5 @@ int command_mcdp(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(mcdp, command_mcdp,
 			"info|devid <id>|appstest <cmd> [<params>]",
-			"USB PD",
-			NULL);
+			"USB PD");
 #endif /* CONFIG_CMD_MCDP */
diff --git a/driver/pmu_tps65090.c b/driver/pmu_tps65090.c
index ba3407c81d..665801538a 100644
--- a/driver/pmu_tps65090.c
+++ b/driver/pmu_tps65090.c
@@ -694,8 +694,7 @@ static int command_pmu(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pmu, command_pmu,
 			"<repeat_count|reset>",
-			"Print PMU info or force a hard reset",
-			NULL);
+			"Print PMU info or force a hard reset");
 #endif
 
 /*****************************************************************************/
diff --git a/driver/pmu_tps65090_powerinfo.c b/driver/pmu_tps65090_powerinfo.c
index 9eb6adca42..3ab4fb26b3 100644
--- a/driver/pmu_tps65090_powerinfo.c
+++ b/driver/pmu_tps65090_powerinfo.c
@@ -112,8 +112,7 @@ static int command_powerinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerinfo, command_powerinfo,
 		NULL,
-		"Show PMU power info",
-		NULL);
+		"Show PMU power info");
 
 /**
  * Host command to get power info from PMU
diff --git a/driver/regulator_ir357x.c b/driver/regulator_ir357x.c
index e87094534d..4f65db13e6 100644
--- a/driver/regulator_ir357x.c
+++ b/driver/regulator_ir357x.c
@@ -236,8 +236,7 @@ static int command_ir357x(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(ir357x, command_ir357x,
 			"[check|write]",
-			"IR357x core regulator control",
-			NULL);
+			"IR357x core regulator control");
 #endif
 
 static void ir357x_hot_settings(void)
diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c
index 858ae38769..948569da1c 100644
--- a/driver/temp_sensor/g78x.c
+++ b/driver/temp_sensor/g78x.c
@@ -231,5 +231,5 @@ static int command_g78x(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(g78x, command_g78x,
 	"[settemp|setbyte <offset> <value>] or [getbyte <offset>]. "
 	"Temps in Celsius.",
-	"Print g781/g782 temp sensor status or set parameters.", NULL);
+	"Print g781/g782 temp sensor status or set parameters.");
 #endif
diff --git a/driver/temp_sensor/tmp006.c b/driver/temp_sensor/tmp006.c
index a816f20ec2..9801963ff5 100644
--- a/driver/temp_sensor/tmp006.c
+++ b/driver/temp_sensor/tmp006.c
@@ -436,8 +436,7 @@ static int command_sensor_info(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(tmp006, command_sensor_info,
 			"[ <index> ]",
-			"Print TMP006 sensors",
-			NULL);
+			"Print TMP006 sensors");
 #endif
 
 /* Disable the t6cal command until/unless we have FP support in printf */
@@ -493,6 +492,5 @@ static int command_t6cal(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(t6cal, command_t6cal,
 			"[<index> <coeff_name> <radix>]",
-			"Set/print TMP006 calibration",
-			NULL);
+			"Set/print TMP006 calibration");
 #endif
diff --git a/driver/temp_sensor/tmp432.c b/driver/temp_sensor/tmp432.c
index ea49fcb28b..f288f40ed5 100644
--- a/driver/temp_sensor/tmp432.c
+++ b/driver/temp_sensor/tmp432.c
@@ -330,7 +330,7 @@ DECLARE_CONSOLE_COMMAND(tmp432, command_tmp432,
 	"[settemp|setbyte <offset> <value>] or [getbyte <offset>] or"
 	"[power <on|off>]. "
 	"Temps in Celsius.",
-	"Print tmp432 temp sensor status or set parameters.", NULL);
+	"Print tmp432 temp sensor status or set parameters.");
 #endif
 
 int tmp432_set_power(enum tmp432_power_state power_on)
diff --git a/driver/usb_mux.c b/driver/usb_mux.c
index 05222e1d84..fde578da39 100644
--- a/driver/usb_mux.c
+++ b/driver/usb_mux.c
@@ -152,8 +152,7 @@ static int command_typec(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(typec, command_typec,
 			"[port|debug] [none|usb|dp|dock]",
-			"Control type-C connector muxing",
-			NULL);
+			"Control type-C connector muxing");
 #endif
 
 static int hc_usb_pd_mux_info(struct host_cmd_handler_args *args)
diff --git a/include/console.h b/include/console.h
index f1f06b19bd..f0c96a167f 100644
--- a/include/console.h
+++ b/include/console.h
@@ -101,27 +101,32 @@ void console_has_input(void);
  *			int handler(int argc, char **argv)
  * @param argdesc	String describing arguments to command; NULL if none.
  * @param shorthelp	String with one-line description of command.
- * @param longhelp	String with long description of command.
  */
 #ifndef HAS_TASK_CONSOLE
-#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \
-	int (routine)(int argc, char **argv) __attribute__((unused))
+#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP)	\
+	int (ROUTINE)(int argc, char **argv) __attribute__((unused))
 #elif defined(CONFIG_CONSOLE_CMDHELP)
-#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \
-	static const char __con_cmd_label_##name[] = #name;		\
-	struct size_check##name { \
-		int field[2 * (sizeof(__con_cmd_label_##name) < 16) - 1]; }; \
-	const struct console_command __keep __con_cmd_##name		\
-	__attribute__((section(".rodata.cmds." #name)))			\
-	     = {__con_cmd_label_##name, routine, argdesc, shorthelp}
+#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP)	\
+	static const char __con_cmd_label_##NAME[] = #NAME;		\
+	struct size_check##NAME {					\
+		int field[2 * (sizeof(__con_cmd_label_##NAME) < 16) - 1]; }; \
+	const struct console_command __keep __con_cmd_##NAME		\
+	__attribute__((section(".rodata.cmds." #NAME)))	=		\
+	{ .name = __con_cmd_label_##NAME,				\
+	  .handler = ROUTINE,						\
+	  .argdesc = ARGDESC,						\
+	  .shorthelp = SHORTHELP					\
+	}
 #else
-#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \
-	static const char __con_cmd_label_##name[] = #name;		\
-	struct size_check##name { \
-		int field[2 * (sizeof(__con_cmd_label_##name) < 16) - 1]; }; \
-	const struct console_command __keep __con_cmd_##name		\
-	__attribute__((section(".rodata.cmds." #name)))			\
-	     = {__con_cmd_label_##name, routine}
+#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP)	\
+	static const char __con_cmd_label_##NAME[] = #NAME;		\
+	struct size_check##NAME {					\
+		int field[2 * (sizeof(__con_cmd_label_##NAME) < 16) - 1]; }; \
+	const struct console_command __keep __con_cmd_##NAME		\
+	__attribute__((section(".rodata.cmds." #NAME))) =		\
+	{ .name = __con_cmd_label_##NAME,				\
+	  .handler = ROUTINE,						\
+	}
 #endif
 
 #endif  /* __CROS_EC_CONSOLE_H */
diff --git a/power/baytrail.c b/power/baytrail.c
index 3290378234..975d9d27d8 100644
--- a/power/baytrail.c
+++ b/power/baytrail.c
@@ -422,5 +422,4 @@ static int console_command_powerfail(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerfail, console_command_powerfail,
 			NULL,
-			"Fake PLTRST# failure during next power-on",
-			NULL);
+			"Fake PLTRST# failure during next power-on");
diff --git a/power/common.c b/power/common.c
index cdefe38b9a..1916758482 100644
--- a/power/common.c
+++ b/power/common.c
@@ -575,8 +575,7 @@ static int command_powerinfo(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(powerinfo, command_powerinfo,
 			NULL,
-			"Show current power state",
-			NULL);
+			"Show current power state");
 
 #ifdef CONFIG_CMD_POWERINDEBUG
 static int command_powerindebug(int argc, char **argv)
@@ -611,8 +610,7 @@ static int command_powerindebug(int argc, char **argv)
 };
 DECLARE_CONSOLE_COMMAND(powerindebug, command_powerindebug,
 			"[mask]",
-			"Get/set power input debug mask",
-			NULL);
+			"Get/set power input debug mask");
 #endif
 
 #ifdef CONFIG_HIBERNATE
@@ -640,8 +638,7 @@ static int command_hibernation_delay(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(hibdelay, command_hibernation_delay,
 			"[sec]",
-			"Set the delay before going into hibernation",
-			NULL);
+			"Set the delay before going into hibernation");
 
 static int host_command_hibernation_delay(struct host_cmd_handler_args *args)
 {
@@ -703,8 +700,7 @@ static int command_pause_in_s5(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(pause_in_s5, command_pause_in_s5,
 			"[on|off]",
-			"Should the AP pause in S5 during shutdown?",
-			NULL);
+			"Should the AP pause in S5 during shutdown?");
 #endif /* CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5 */
 
 #ifdef CONFIG_POWER_TRACK_HOST_SLEEP_STATE
diff --git a/power/gaia.c b/power/gaia.c
index a5e0ff0fd7..0595802ec5 100644
--- a/power/gaia.c
+++ b/power/gaia.c
@@ -689,8 +689,7 @@ static int command_force_power(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(forcepower, command_force_power,
 			NULL,
-			"Force power on",
-			NULL);
+			"Force power on");
 
 static const char *power_req_name[POWER_REQ_COUNT] = {
 	"none",
@@ -745,5 +744,4 @@ static int command_power(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(power, command_power,
 			"on/off",
-			"Turn AP power on/off",
-			NULL);
+			"Turn AP power on/off");
diff --git a/power/mediatek.c b/power/mediatek.c
index 6cfa4fd650..7ac9143803 100644
--- a/power/mediatek.c
+++ b/power/mediatek.c
@@ -817,5 +817,4 @@ static int command_power(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(power, command_power,
 			"on/off",
-			"Turn AP power on/off",
-			NULL);
+			"Turn AP power on/off");
diff --git a/power/rockchip.c b/power/rockchip.c
index b448ad2f3d..eb33d3e91e 100644
--- a/power/rockchip.c
+++ b/power/rockchip.c
@@ -576,5 +576,4 @@ static int command_power(int argc, char **argv)
 }
 DECLARE_CONSOLE_COMMAND(power, command_power,
 			"on/off",
-			"Turn AP power on/off",
-			NULL);
+			"Turn AP power on/off");
diff --git a/test/console_edit.c b/test/console_edit.c
index 945e98b453..b6ca3cad6e 100644
--- a/test/console_edit.c
+++ b/test/console_edit.c
@@ -19,14 +19,14 @@ static int command_test_1(int argc, char **argv)
 	cmd_1_call_cnt++;
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(test1, command_test_1, NULL, NULL, NULL);
+DECLARE_CONSOLE_COMMAND(test1, command_test_1, NULL, NULL);
 
 static int command_test_2(int argc, char **argv)
 {
 	cmd_2_call_cnt++;
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(test2, command_test_2, NULL, NULL, NULL);
+DECLARE_CONSOLE_COMMAND(test2, command_test_2, NULL, NULL);
 
 /*****************************************************************************/
 /* Test utilities */
author	Bill Richardson <wfrichar@chromium.org>	2016-08-22 17:55:12 -0700
committer	Bill Richardson <wfrichar@chromium.org>	2016-08-24 16:30:10 +0000
commit	bb15561db56728b83ee7fe35e534da7577a7729d (patch)
tree	e586ee3b18c8fda464da38b42a06845f0d7f6786
parent	f322e32a3ec052be3f0c226145448fed63aa7ef9 (diff)
download	chrome-ec-bb15561db56728b83ee7fe35e534da7577a7729d.tar.gz