From 751191944175591a03fdd5d1428bbcff7c1b000d Mon Sep 17 00:00:00 2001
From: Toshiaki Yamane <yamanetoshi@gmail.com>
Date: Fri, 7 Sep 2012 13:31:19 +0900
Subject: [PATCH] --- yaml --- r: 325023 b: refs/heads/master c:
 25a52911a90838cc37b8eda092bed42381317791 h: refs/heads/master i:   325021:
 e3eef0cae96a301df1f66a22b21bc7d0fb495846   325019:
 258e5e5de67c5835536e85a71dd78ed587fc5f35   325015:
 08fd6592358d52f495d2f69207018a70f63d9a13   325007:
 32b74eb659794b01a0197deb23497d05e64f58bc   324991:
 2df8fb1dfdb205fdfcc3346119b46b59cae966d2 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/rts_pstor/sd.c | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 24769ee3b7e3..95ad8a40ec97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82ee0c898b358084248463355ad8f8cbadcf971d
+refs/heads/master: 25a52911a90838cc37b8eda092bed42381317791
diff --git a/trunk/drivers/staging/rts_pstor/sd.c b/trunk/drivers/staging/rts_pstor/sd.c
index 9812c006632e..02139b479872 100644
--- a/trunk/drivers/staging/rts_pstor/sd.c
+++ b/trunk/drivers/staging/rts_pstor/sd.c
@@ -1779,17 +1779,16 @@ static int sd_tuning_tx(struct rtsx_chip *chip)
 	int (*tuning_cmd)(struct rtsx_chip *chip, u8 sample_point);
 
 	if (CHK_SD(sd_card)) {
-		if (CHK_SD_DDR50(sd_card)) {
+		if (CHK_SD_DDR50(sd_card))
 			tuning_cmd = sd_ddr_tuning_tx_cmd;
-		} else {
+		else
 			tuning_cmd = sd_sdr_tuning_tx_cmd;
-		}
+
 	} else {
-		if (CHK_MMC_DDR52(sd_card)) {
+		if (CHK_MMC_DDR52(sd_card))
 			tuning_cmd = sd_ddr_tuning_tx_cmd;
-		} else {
+		else
 			TRACE_RET(chip, STATUS_FAIL);
-		}
 	}
 
 	for (i = 0; i < 3; i++) {
@@ -1803,27 +1802,24 @@ static int sd_tuning_tx(struct rtsx_chip *chip)
 			}
 
 			retval = tuning_cmd(chip, (u8)j);
-			if (retval == STATUS_SUCCESS) {
+			if (retval == STATUS_SUCCESS)
 				raw_phase_map[i] |= 1 << j;
-			}
 		}
 	}
 
 	phase_map = raw_phase_map[0] & raw_phase_map[1] & raw_phase_map[2];
-	for (i = 0; i < 3; i++) {
+	for (i = 0; i < 3; i++)
 		RTSX_DEBUGP("TX raw_phase_map[%d] = 0x%08x\n", i, raw_phase_map[i]);
-	}
+
 	RTSX_DEBUGP("TX phase_map = 0x%08x\n", phase_map);
 
 	final_phase = sd_search_final_phase(chip, phase_map, TUNE_TX);
-	if (final_phase == 0xFF) {
+	if (final_phase == 0xFF)
 		TRACE_RET(chip, STATUS_FAIL);
-	}
 
 	retval = sd_change_phase(chip, final_phase, TUNE_TX);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_RET(chip, STATUS_FAIL);
-	}
 
 	return STATUS_SUCCESS;
 }