Merge tag 'efi-2019-07-rc4-2' of git://git.denx.de/u-boot-efi

[oweals/u-boot.git] / cmd / ubi.c

diff --git a/cmd/ubi.c b/cmd/ubi.c
index 2b74a9814463f084037fa42c83ba6a6cc2f4b327..c511a2fb7601f8d49b2a4353b48f289f04d23770 100644 (file)
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -101,7 +101,6 @@ static int ubi_check(char *name)
        return 1;
 }
 
-
 static int verify_mkvol_req(const struct ubi_device *ubi,
                            const struct ubi_mkvol_req *req)
 {
@@ -415,7 +414,7 @@ static int ubi_dev_scan(struct mtd_info *info, const char *vid_header_offset)
        return 0;
 }
 
-int ubi_detach(void)
+static int ubi_detach(void)
 {
 #ifdef CONFIG_CMD_UBIFS
        /*
@@ -473,14 +472,8 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-
-       if (strcmp(argv[1], "detach") == 0) {
-               if (argc < 2)
-                       return CMD_RET_USAGE;
-
+       if (strcmp(argv[1], "detach") == 0)
                return ubi_detach();
-       }
-
 
        if (strcmp(argv[1], "part") == 0) {
                const char *vid_header_offset = NULL;