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

[u-boot] / cmd / usb_mass_storage.c

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index ac53a73310bb9dd0d95217921d838201cc4987bf..0d551141e0dd2a191d035a0653dab1697129e4a7 100644 (file)
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Samsung Electronics
  * Lukasz Majewski <l.majewski@samsung.com>
  *
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <errno.h>
@@ -22,7 +21,7 @@ static int ums_read_sector(struct ums *ums_dev,
        struct blk_desc *block_dev = &ums_dev->block_dev;
        lbaint_t blkstart = start + ums_dev->start_sector;
 
-       return block_dev->block_read(block_dev, blkstart, blkcnt, buf);
+       return blk_dread(block_dev, blkstart, blkcnt, buf);
 }
 
 static int ums_write_sector(struct ums *ums_dev,
@@ -31,7 +30,7 @@ static int ums_write_sector(struct ums *ums_dev,
        struct blk_desc *block_dev = &ums_dev->block_dev;
        lbaint_t blkstart = start + ums_dev->start_sector;
 
-       return block_dev->block_write(block_dev, blkstart, blkcnt, buf);
+       return blk_dwrite(block_dev, blkstart, blkcnt, buf);
 }
 
 static struct ums *ums;
@@ -44,7 +43,7 @@ static void ums_fini(void)
        for (i = 0; i < ums_count; i++)
                free((void *)ums[i].name);
        free(ums);
-       ums = 0;
+       ums = NULL;
        ums_count = 0;
 }
 
@@ -56,7 +55,7 @@ static int ums_init(const char *devtype, const char *devnums_part_str)
        struct blk_desc *block_dev;
        disk_partition_t info;
        int partnum;
-       int ret;
+       int ret = -1;
        struct ums *ums_new;
 
        s = strdup(devnums_part_str);
@@ -85,16 +84,12 @@ static int ums_init(const char *devtype, const char *devnums_part_str)
                        partnum = 0;
 
                /* f_mass_storage.c assumes SECTOR_SIZE sectors */
-               if (block_dev->blksz != SECTOR_SIZE) {
-                       ret = -1;
+               if (block_dev->blksz != SECTOR_SIZE)
                        goto cleanup;
-               }
 
                ums_new = realloc(ums, (ums_count + 1) * sizeof(*ums));
-               if (!ums_new) {
-                       ret = -1;
+               if (!ums_new)
                        goto cleanup;
-               }
                ums = ums_new;
 
                /* if partnum = 0, expose all partitions */
@@ -110,10 +105,8 @@ static int ums_init(const char *devtype, const char *devnums_part_str)
                ums[ums_count].write_sector = ums_write_sector;
 
                name = malloc(UMS_NAME_LEN);
-               if (!name) {
-                       ret = -1;
+               if (!name)
                        goto cleanup;
-               }
                snprintf(name, UMS_NAME_LEN, "UMS disk %d", ums_count);
                ums[ums_count].name = name;
                ums[ums_count].block_dev = *block_dev;
@@ -127,9 +120,7 @@ static int ums_init(const char *devtype, const char *devnums_part_str)
                ums_count++;
        }
 
-       if (!ums_count)
-               ret = -1;
-       else
+       if (ums_count)
                ret = 0;
 
 cleanup:
@@ -141,7 +132,7 @@ cleanup:
        return ret;
 }
 
-int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
+static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
                               int argc, char * const argv[])
 {
        const char *usb_controller;
@@ -170,21 +161,21 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
        controller_index = (unsigned int)(simple_strtoul(
                                usb_controller, NULL, 0));
        if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
-               error("Couldn't init USB controller.");
+               pr_err("Couldn't init USB controller.\n");
                rc = CMD_RET_FAILURE;
                goto cleanup_ums_init;
        }
 
        rc = fsg_init(ums, ums_count);
        if (rc) {
-               error("fsg_init failed");
+               pr_err("fsg_init failed\n");
                rc = CMD_RET_FAILURE;
                goto cleanup_board;
        }
 
        rc = g_dnl_register("usb_dnl_ums");
        if (rc) {
-               error("g_dnl_register failed");
+               pr_err("g_dnl_register failed\n");
                rc = CMD_RET_FAILURE;
                goto cleanup_board;
        }