From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 23 May 2014 19:24:46 +0000 (-0600)
Subject: cmd_mmc: Use init_mmc_device() from do_mmc_rescan()
X-Git-Tag: v2014.07-rc4~67^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=941944e445193a07dea77787680666db049a14dc;p=oweals%2Fu-boot.git

cmd_mmc: Use init_mmc_device() from do_mmc_rescan()

The body of init_mmc_device() is now identical to that of do_mmc_rescan()
except for the error codes returned. Modify do_mmc_rescan() to simply
call init_mmc_device() and convert the error codes, to avoid code
duplication.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
---

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 6741ebee3b..6c8db2e78c 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -371,16 +371,10 @@ static int do_mmc_rescan(cmd_tbl_t *cmdtp, int flag,
 {
 	struct mmc *mmc;
 
-	mmc = find_mmc_device(curr_device);
-	if (!mmc) {
-		printf("no mmc device at slot %x\n", curr_device);
+	mmc = init_mmc_device(curr_device, true);
+	if (!mmc)
 		return CMD_RET_FAILURE;
-	}
-
-	mmc->has_init = 0;
 
-	if (mmc_init(mmc))
-		return CMD_RET_FAILURE;
 	return CMD_RET_SUCCESS;
 }
 static int do_mmc_part(cmd_tbl_t *cmdtp, int flag,