commit e414052f02604d93f3e89b4e8fe3b10692dd9d7d
author Scott Anderson <saa@google.com> Thu Nov 17 14:24:43 2011 -0800
committer Mike J. Chen <mjchen@google.com> Sat Mar 03 17:29:24 2012 -0800
tree e847fda8ebf977e79db2e61eba07c125bbb683f0
parent 408cd789bda95fb9fb0de1d1c80453cabd620106

MMC: Fix code for dumping Samsung MMC Smart Report

I mistakenly submitted a slightly out of date version of the code
initially.  Clean up the error handling and fix compile problems.

Change-Id: I3728e028c40ea7e30e0105718588983c9dc0c344
Signed-off-by: Scott Anderson <saa@google.com>

drivers/mmc/mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ef56ca8..e4549f8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1367,7 +1367,7 @@
 {
 	struct mmc *mmc;
 	struct mmc_cmd cmd;
-	int i, read_ret;
+	int i, ret, read_ret;
 	char *ep;
 	uint32_t val, data[512 / 4];
 
@@ -1391,15 +1391,15 @@
 
 	/* Enter Smart Report Mode */
 	cmd.cmdarg = 0xEFAC62EC;
-	i = mmc_send_cmd(mmc, &cmd, NULL);
-	if (i) {
-		printf("Error 1:%d entering Smart Report mode.\n", i);
+	ret = mmc_send_cmd(mmc, &cmd, NULL);
+	if (ret) {
+		printf("Error 1:%d entering Smart Report mode.\n", ret);
 		return 1;
 	}
 	cmd.cmdarg = 0x0000CCEE;
-	i = mmc_send_cmd(mmc, &cmd, NULL);
-	if (i) {
-		printf("Error 2:%d entering Smart Report mode.\n", i);
+	ret = mmc_send_cmd(mmc, &cmd, NULL);
+	if (ret) {
+		printf("Error 2:%d entering Smart Report mode.\n", ret);
 		return 1;
 	}
 
@@ -1408,15 +1408,16 @@
 
 	/* Exit Smart Report Mode */
 	cmd.cmdarg = 0xEFAC62EC;
-	i = mmc_send_cmd(mmc, &cmd, NULL);
-	if (i) {
-		printf("Error 1:%d entering Smart Report mode.\n", i);
-		return 1;
+	ret = mmc_send_cmd(mmc, &cmd, NULL);
+	if (ret)
+		printf("Error 1:%d exiting Smart Report mode.\n", ret);
+	else {
+		cmd.cmdarg = 0x00DECCEE;
+		ret = mmc_send_cmd(mmc, &cmd, NULL);
+		if (ret)
+			printf("Error 2:%d exiting Smart Report mode.\n", ret);
 	}
-	cmd.cmdarg = 0x00DECCEE;
-	i = mmc_send_cmd(mmc, &cmd, NULL);
 
-	printf("rets = %d, %d, %d, %d, %d\n", ret, ret2, read_ret, ret3, ret4);
 	if (read_ret != 1) {
 		printf("Smart Report could not be read.\n");
 		return 1;