From 34e4cf13f729da24d0ff25393acea1f5fdb5e375 Mon Sep 17 00:00:00 2001 From: Venkat Gopalakrishnan Date: Fri, 9 Jan 2015 15:09:11 -0800 Subject: [PATCH] mmc: core: Update HS400 timing mode before performing tuning There is no need to prepare anything additional before tuning for HS400 other than updating the HS400 timing mode, so just do that. Change-Id: Ib7a72a4bb9b901e32413acf440c925c4cd50a73d Signed-off-by: Venkat Gopalakrishnan [subhashj@codeaurora.org: fixed trivial merge conflicts] Signed-off-by: Subhash Jadavani --- drivers/mmc/core/mmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 7cd054d391fb..d1f46fa6343d 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1461,8 +1461,7 @@ static int mmc_hs200_tuning(struct mmc_card *card) */ if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400 && host->ios.bus_width == MMC_BUS_WIDTH_8) - if (host->ops->prepare_hs400_tuning) - host->ops->prepare_hs400_tuning(host, &host->ios); + mmc_set_timing(host, MMC_TIMING_MMC_HS400); return mmc_execute_tuning(card); }