X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmd%2Fscsi.c;h=8e36de107e9a91a01376164accfdb96c4fd235a0;hb=19d1f1a2f3ccfbf85125150f7876ce22714b38bd;hp=7442e6aef4d9d06a2efcb0eb55ed5d4a416a0db3;hpb=c002e39ae669403baf21a7e04473447387f6302d;p=platform%2Fkernel%2Fu-boot.git

diff --git a/cmd/scsi.c b/cmd/scsi.c
index 7442e6a..8e36de1 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -17,7 +17,7 @@ static int scsi_curr_dev; /* current device */
 /*
  * scsi boot command intepreter. Derived from diskboot
  */
-int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
 	return common_diskboot(cmdtp, "scsi", argc, argv);
 }
@@ -25,7 +25,7 @@ int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 /*
  * scsi command intepreter
  */
-int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
 	int ret;
 
@@ -36,8 +36,10 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 	case 2:
 		if (strncmp(argv[1], "res", 3) == 0) {
 			printf("\nReset SCSI\n");
-			scsi_bus_reset();
-			ret = scsi_scan(1);
+#ifndef CONFIG_DM_SCSI
+			scsi_bus_reset(NULL);
+#endif
+			ret = scsi_scan(true);
 			if (ret)
 				return CMD_RET_FAILURE;
 			return ret;
@@ -55,7 +57,7 @@ int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 			return 0;
 		}
 		if (strncmp(argv[1], "scan", 4) == 0) {
-			ret = scsi_scan(1);
+			ret = scsi_scan(true);
 			if (ret)
 				return CMD_RET_FAILURE;
 			return ret;