mmc: avoid division by zero in meson_mmc_config_clock

[u-boot] / cmd / usb_mass_storage.c

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index b05913ac34464903bbc285f52b7a129843bbf5cf..cfeecb7068a6c7ed5170297ae6eceaceba477dd5 100644 (file)
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -22,7 +22,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 +31,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 +44,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;
 }
 
@@ -133,7 +133,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;
@@ -162,21 +162,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.");
                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");
                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");
                rc = CMD_RET_FAILURE;
                goto cleanup_board;
        }