ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

[u-boot] / common / cmd_ubifs.c

diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c
index 9017041af4598d5c42f254cf4536c211e1d42572..a0ec184486dc08a330e063a97b55990fab69f7ae 100644 (file)
--- a/common/cmd_ubifs.c
+++ b/common/cmd_ubifs.c
@@ -47,10 +47,9 @@ int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char *vol_name;
        int ret;
 
-       if (argc != 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 2)
+               return cmd_usage(cmdtp);
+
        vol_name = argv[1];
        debug("Using volume %s\n", vol_name);
 
@@ -102,25 +101,19 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return -1;
        }
 
-       if (argc < 3) {
-               cmd_usage(cmdtp);
-               return -1;
-       }
+       if (argc < 3)
+               return cmd_usage(cmdtp);
 
        addr = simple_strtoul(argv[1], &endp, 16);
-       if (endp == argv[1]) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (endp == argv[1])
+               return cmd_usage(cmdtp);
 
        filename = argv[2];
 
        if (argc == 4) {
                size = simple_strtoul(argv[3], &endp, 16);
-               if (endp == argv[3]) {
-                       cmd_usage(cmdtp);
-                       return 1;
-               }
+               if (endp == argv[3])
+                       return cmd_usage(cmdtp);
        }
        debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
 
@@ -138,13 +131,15 @@ U_BOOT_CMD(
        "    - mount 'volume-name' volume"
 );
 
-U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls,
+U_BOOT_CMD(
+       ubifsls, 2, 0, do_ubifs_ls,
        "list files in a directory",
        "[directory]\n"
        "    - list files in a 'directory' (default '/')"
 );
 
-U_BOOT_CMD(ubifsload, 4, 0, do_ubifs_load,
+U_BOOT_CMD(
+       ubifsload, 4, 0, do_ubifs_load,
        "load file from an UBIFS filesystem",
        "<addr> <filename> [bytes]\n"
        "    - load file 'filename' to address 'addr'"