Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[karo-tx-uboot.git] / common / cmd_led.c

diff --git a/common/cmd_led.c b/common/cmd_led.c
index 0e4ebc59c0bac370fde2016abefe634b1880ecc0..84f79fae00698e2e70199090919b1981bafd6a1f 100644 (file)
--- a/common/cmd_led.c
+++ b/common/cmd_led.c
@@ -57,16 +57,16 @@ static const led_tbl_t led_commands[] = {
 #endif
 #endif
 #ifdef STATUS_LED_GREEN
-       { "green", STATUS_LED_GREEN, green_LED_off, green_LED_on, NULL },
+       { "green", STATUS_LED_GREEN, green_led_off, green_led_on, NULL },
 #endif
 #ifdef STATUS_LED_YELLOW
-       { "yellow", STATUS_LED_YELLOW, yellow_LED_off, yellow_LED_on, NULL },
+       { "yellow", STATUS_LED_YELLOW, yellow_led_off, yellow_led_on, NULL },
 #endif
 #ifdef STATUS_LED_RED
-       { "red", STATUS_LED_RED, red_LED_off, red_LED_on, NULL },
+       { "red", STATUS_LED_RED, red_led_off, red_led_on, NULL },
 #endif
 #ifdef STATUS_LED_BLUE
-       { "blue", STATUS_LED_BLUE, blue_LED_off, blue_LED_on, NULL },
+       { "blue", STATUS_LED_BLUE, blue_led_off, blue_led_on, NULL },
 #endif
        { NULL, 0, NULL, NULL, NULL }
 };
@@ -93,12 +93,12 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        /* Validate arguments */
        if ((argc != 3)) {
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
 
        cmd = get_led_cmd(argv[2]);
        if (cmd < 0) {
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
 
        for (i = 0; led_commands[i].string; i++) {
@@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                if (led_commands[i].on)
                                        led_commands[i].on();
                                else
-                                       __led_set(led_commands[i].mask, 1);
+                                       __led_set(led_commands[i].mask,
+                                                         STATUS_LED_ON);
                                break;
                        case LED_OFF:
                                if (led_commands[i].off)
                                        led_commands[i].off();
                                else
-                                       __led_set(led_commands[i].mask, 0);
+                                       __led_set(led_commands[i].mask,
+                                                         STATUS_LED_OFF);
                                break;
                        case LED_TOGGLE:
                                if (led_commands[i].toggle)
@@ -132,7 +134,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        /* If we ran out of matches, print Usage */
        if (!match) {
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
 
        return 0;
@@ -140,7 +142,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 U_BOOT_CMD(
        led, 3, 1, do_led,
-       "led\t- ["
+       "["
 #ifdef CONFIG_BOARD_SPECIFIC_LED
 #ifdef STATUS_LED_BIT
        "0|"
@@ -167,6 +169,6 @@ U_BOOT_CMD(
 #ifdef STATUS_LED_BLUE
        "blue|"
 #endif
-       "all] [on|off|toggle]\n",
-       "led [led_name] [on|off|toggle] sets or clears led(s)\n"
+       "all] [on|off|toggle]",
+       "[led_name] [on|off|toggle] sets or clears led(s)"
 );