X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fthordown.c;h=8dae024e31db2bc601c617c4a302932a66a5e4bf;hb=c366a45649a33fc75857afb72f2e7358a906d3d7;hp=436b7f56315eb5985016d4d597c6c8ba94959885;hpb=82d72a1b9967cff4908f22c57536c3660f794401;p=oweals%2Fu-boot.git

diff --git a/cmd/thordown.c b/cmd/thordown.c
index 436b7f5631..8dae024e31 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_thordown.c -- USB TIZEN "THOR" Downloader gadget
  *
  * Copyright (C) 2013 Lukasz Majewski <l.majewski@samsung.com>
  * All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
@@ -31,32 +30,37 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		goto done;
 
 	int controller_index = simple_strtoul(usb_controller, NULL, 0);
-	ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+	ret = usb_gadget_initialize(controller_index);
 	if (ret) {
-		error("USB init failed: %d", ret);
+		pr_err("USB init failed: %d\n", ret);
 		ret = CMD_RET_FAILURE;
 		goto exit;
 	}
 
-	g_dnl_register("usb_dnl_thor");
+	ret = g_dnl_register("usb_dnl_thor");
+	if (ret) {
+		pr_err("g_dnl_register failed %d\n", ret);
+		ret = CMD_RET_FAILURE;
+		goto exit;
+	}
 
 	ret = thor_init();
 	if (ret) {
-		error("THOR DOWNLOAD failed: %d", ret);
+		pr_err("THOR DOWNLOAD failed: %d\n", ret);
 		ret = CMD_RET_FAILURE;
 		goto exit;
 	}
 
 	ret = thor_handle();
 	if (ret) {
-		error("THOR failed: %d", ret);
+		pr_err("THOR failed: %d\n", ret);
 		ret = CMD_RET_FAILURE;
 		goto exit;
 	}
 
 exit:
 	g_dnl_unregister();
-	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+	usb_gadget_release(controller_index);
 done:
 	dfu_free_entities();
 
@@ -66,7 +70,7 @@ done:
 U_BOOT_CMD(thordown, CONFIG_SYS_MAXARGS, 1, do_thor_down,
 	   "TIZEN \"THOR\" downloader",
 	   "<USB_controller> <interface> <dev>\n"
-	   "  - device software upgrade via LTHOR TIZEN dowload\n"
+	   "  - device software upgrade via LTHOR TIZEN download\n"
 	   "    program via <USB_controller> on device <dev>,\n"
 	   "	attached to interface <interface>\n"
 );