cmd_usage(): simplify return code handling

[people/ms/u-boot.git] / board / trab / cmd_trab.c

diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c
index 04a36075b85247dcd7125a5e1aba2104b8d24cad..ca4415c0b9234716c8e1d5238cc4bfee2e48fd7c 100644 (file)
--- a/board/trab/cmd_trab.c
+++ b/board/trab/cmd_trab.c
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <s3c2400.h>
+#include <asm/arch/s3c24x0_cpu.h>
 #include <rtc.h>
 
 /*
@@ -109,16 +109,16 @@ extern s32 tsc2000_contact_temp (void);
 extern void tsc2000_spi_init(void);
 
 /* function declarations */
-int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int i2c_write_multiple (uchar chip, uint addr, int alen,
                        uchar *buffer, int len);
 int i2c_read_multiple (uchar chip, uint addr, int alen,
                        uchar *buffer, int len);
-int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 /* helper functions */
 static void adc_init (void);
@@ -162,15 +162,13 @@ typedef struct test_function_s {
 test_function_t test_function[BIF_MAX];
 
 
-int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int i;
        int cycle_status;
 
-       if (argc > 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 1)
+               return cmd_usage(cmdtp);
 
        led_init ();
        global_vars_init ();
@@ -266,18 +264,15 @@ U_BOOT_CMD(
 );
 
 
-int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int i, dip;
 
-       if (argc > 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 1)
+               return cmd_usage(cmdtp);
 
-       if ((dip = read_dip ()) == -1) {
+       if ((dip = read_dip ()) == -1)
                return 1;
-       }
 
        for (i = 0; i < 4; i++) {
                if ((dip & (1 << i)) == 0)
@@ -299,18 +294,15 @@ U_BOOT_CMD(
 );
 
 
-int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int vcc5v;
 
-       if (argc > 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 1)
+               return cmd_usage(cmdtp);
 
-       if ((vcc5v = read_vcc5v ()) == -1) {
+       if ((vcc5v = read_vcc5v ()) == -1)
                return (1);
-       }
 
        printf ("%d", (vcc5v / 1000));
        printf (".%d", (vcc5v % 1000) / 100);
@@ -327,14 +319,12 @@ U_BOOT_CMD(
 );
 
 
-int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int contact_temp;
 
-       if (argc > 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 1)
+               return cmd_usage(cmdtp);
 
        tsc2000_spi_init ();
 
@@ -352,38 +342,34 @@ U_BOOT_CMD(
 );
 
 
-int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       if (argc > 1) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 1)
+               return cmd_usage(cmdtp);
 
        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_STATUS, 1,
-                               (unsigned char*) &status, 1)) {
+                               (unsigned char*) &status, 1))
                return (1);
-       }
+
        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_PASS_CYCLES, 1,
-                               (unsigned char*) &pass_cycles, 2)) {
+                               (unsigned char*) &pass_cycles, 2))
                return (1);
-       }
+
        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_CYCLE,
-                               1, (unsigned char*) &first_error_cycle, 2)) {
+                               1, (unsigned char*) &first_error_cycle, 2))
                return (1);
-       }
+
        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NUM,
-                               1, (unsigned char*) &first_error_num, 1)) {
+                               1, (unsigned char*) &first_error_num, 1))
                return (1);
-       }
+
        if (i2c_read_multiple (I2C_EEPROM_DEV_ADDR, EE_ADDR_FIRST_ERROR_NAME,
                               1, (unsigned char*)first_error_name,
-                              sizeof (first_error_name))) {
+                              sizeof (first_error_name)))
                return (1);
-       }
 
-       if (read_max_cycles () != 0) {
+       if (read_max_cycles () != 0)
                return (1);
-       }
 
        printf ("max_cycles = %d\n", max_cycles);
        printf ("status = %d\n", status);
@@ -842,7 +828,7 @@ static int dummy(void)
        return (0);
 }
 
-int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int contact_temp;
        int delay = 0;
@@ -850,14 +836,11 @@ int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        struct rtc_time tm;
 #endif
 
-       if (argc > 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc > 2)
+               return cmd_usage(cmdtp);
 
-       if (argc > 1) {
+       if (argc > 1)
                delay = simple_strtoul(argv[1], NULL, 10);
-       }
 
        tsc2000_spi_init ();
        while (1) {