From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbcHXKer (ORCPT ); Wed, 24 Aug 2016 06:34:47 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:40697 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902AbcHXKeq (ORCPT ); Wed, 24 Aug 2016 06:34:46 -0400 X-AuditID: cbfec7f5-f792a6d000001302-48-57bd783a4476 From: Jungseung Lee To: Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jungseung Lee Subject: [PATCH] mmc: core: Add error message when switching fails in mmc_select_hs() Date: Wed, 24 Aug 2016 19:34:09 +0900 Message-id: <1472034849-9100-1-git-send-email-js07.lee@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAJMWRmVeSWpSXmKPExsVy+t/xq7pWFXvDDQ4vNrZ4dPM3q8XlXXPY LI7872e0OL423IHF4861PWwefVtWMXp83iQXwBzFZZOSmpNZllqkb5fAlfH+y2n2gi+cFYe2 HmZqYGzi6GLk5JAQMJGYe2waM4QtJnHh3nq2LkYuDiGBpYwS168uYAJJCAk0MknMn60MYrMJ aEnc+L2JFcQWEUiWWNr5FqyZWUBD4veBmywgtrBAuMTEdc1gcRYBVYn+F1vYQWxeAWeJpQe+ A83kAFqmIDFnks0ERu4FjAyrGEVTS5MLipPSc430ihNzi0vz0vWS83M3MUL8/XUH49JjVocY BTgYlXh4OaP3hguxJpYVV+YeYpTgYFYS4eUoBwrxpiRWVqUW5ccXleakFh9ilOZgURLnnbnr fYiQQHpiSWp2ampBahFMlomDU6qB8eTUAOXAfIsL586/MihRFtBXvOLny8ot8650Z+Nks7DJ CcwfV7W6iv/d27zKaJG1J3ciw2l/zQKtz/HPVswRmFxh0RVldLNu98xU7rwfM9a9OOO3OfYE 8+EcMWPB0KcmJ48qFFXsuFtw86vE6UjT9ZKb3B1YtXT73f1vys3tUXKeIzfl3IxNSizFGYmG WsxFxYkAncTM//MBAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The switch failure message in mmc_select_timing() had been removed since that is invalid: commit 0400ed0a083a ("mmc: core: remove the invalid message in mmc_select_timing") Now, in the case when mmc_select_hs() return error in mmc_select_timing(), there is nothing to print failure message. Let's make for mmc_select_hs() print message itself in the failure case. Signed-off-by: Jungseung Lee --- drivers/mmc/core/mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f2d185c..3486bc7 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1029,6 +1029,10 @@ static int mmc_select_hs(struct mmc_card *card) err = mmc_switch_status(card); } + if (err) + pr_warn("%s: switch to high-speed failed, err:%d\n", + mmc_hostname(card->host), err); + return err; } @@ -1265,11 +1269,8 @@ static int mmc_select_hs400es(struct mmc_card *card) /* Switch card to HS mode */ err = mmc_select_hs(card); - if (err) { - pr_err("%s: switch to high-speed failed, err:%d\n", - mmc_hostname(host), err); + if (err) goto out_err; - } err = mmc_switch_status(card); if (err) -- 1.7.9.5