diff mbox

[U-Boot,v4,05/13] mmc: postponed needless timer initialization

Message ID 1397567221-2065-6-git-send-email-m.zalega@samsung.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Mateusz Zalega April 15, 2014, 1:06 p.m. UTC 
mmc_init() doesn't call get_timer() anymore if MMC is already
initialized.

Signed-off-by: Mateusz Zalega <m.zalega@samsung.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 drivers/mmc/mmc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 16051e5..c93dc24 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1310,15 +1310,18 @@  static int mmc_complete_init(struct mmc *mmc)
 int mmc_init(struct mmc *mmc)
 {
 	int err = IN_PROGRESS;
-	unsigned start = get_timer(0);
+	unsigned start;
 
 	if (mmc->has_init)
 		return 0;
+
+	start = get_timer(0);
+
 	if (!mmc->init_in_progress)
 		err = mmc_start_init(mmc);
-
 	if (!err || err == IN_PROGRESS)
 		err = mmc_complete_init(mmc);
+
 	debug("%s: %d, time %lu\n", __func__, err, get_timer(start));
 	return err;
 }