From patchwork Wed Apr 20 16:51:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 8893111 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 93BD5BF29F for ; Wed, 20 Apr 2016 16:59:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0DCE2020F for ; Wed, 20 Apr 2016 16:59:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA51A20114 for ; Wed, 20 Apr 2016 16:59:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbcDTQ7I (ORCPT ); Wed, 20 Apr 2016 12:59:08 -0400 Received: from mail-bl2on0083.outbound.protection.outlook.com ([65.55.169.83]:35136 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751231AbcDTQ7H (ORCPT ); Wed, 20 Apr 2016 12:59:07 -0400 Received: from BLUPR0301CA0037.namprd03.prod.outlook.com (10.162.113.175) by CY1PR0301MB0714.namprd03.prod.outlook.com (10.160.159.144) with Microsoft SMTP Server (TLS) id 15.1.453.26; Wed, 20 Apr 2016 16:59:04 +0000 Received: from BY2FFO11FD040.protection.gbl (2a01:111:f400:7c0c::174) by BLUPR0301CA0037.outlook.office365.com (2a01:111:e400:5259::47) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Wed, 20 Apr 2016 16:59:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Wed, 20 Apr 2016 16:59:02 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u3KGws5Y023885; Wed, 20 Apr 2016 09:58:59 -0700 From: Dong Aisheng To: CC: , , , , , , , Subject: [PATCH 2/3] mmc: core: remove the invalid message in mmc_select_timing Date: Thu, 21 Apr 2016 00:51:31 +0800 Message-ID: <1461171092-30631-2-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461171092-30631-1-git-send-email-aisheng.dong@nxp.com> References: <1461171092-30631-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131056451428123190; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(2351001)(19580405001)(229853001)(19580395003)(106466001)(105606002)(48376002)(86362001)(92566002)(36756003)(87936001)(85426001)(47776003)(76176999)(50466002)(189998001)(110136002)(5003940100001)(33646002)(5008740100001)(1220700001)(4326007)(50226001)(2906002)(1096002)(15650500001)(2950100001)(586003)(81166005)(6806005)(104016004)(77096005)(50986999)(7059030)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0714; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:t3kiNbaan0ZvimzJWKoPJWRlBTl4Iu/FWwltRwcdUSkcnRiHm83Euhw6iqyOP3Oj2ddzx4nqNg+bhnVYxX80zpnYv65RYW3t06ye/sl3f+ZH2mQmBMNKpyW9cj9fF+MDCAtG/3mPb9xv0ohOINS6jsJYDg+gG/2e2hIv/P4UnbCOqi+04ibUzfk9r7oU+Rk1rzWX7xnfAqGUbHecZo1BlhMpaAH7FE3tksnHs21nSioYXYBeVXvvt6ukcCpLLbi14tjSruDdAWknI5rr0cV96TNSSVtx0BIa+GvCrwWsVOfnBAONf80ap+iBnYBBtNbdXHRg+zJp/ubTei1z9zKjGeSEA6k8TEj4vWJ/7BkUD8p4anMgtl8O6BRe0nVPpzKZrUsz78KrMTTVw+8TwjS/NJHhu72FWZbNqSYhqdA95VcCsI47mAROobVIRPetKSFMRAy6yrl2Q2Ql9Vtx4qWkYKjGRcT3MYRNS42BQGKG+E0xYX/yi5mc9nSjlW7EiZjJF1rsmzq4CqjoQ8RMjcdzv9QTSFL5yQMXzmTX4eflWJvhiT/KPZSPJpDP01QJmLuDgUXlAd8FnIODIRZFb2YBBVPcixnM2jPaJuzw6+oWVzOHSDOkRRWngQeRiei0/cSf MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 071357aa-9f82-40b6-20d4-08d3693d135a X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 2:qiURNokVoTyRicOryfoPXxtPz0gxv/2MNvsXeEubNx6dVpJcz3eos5Vdm7f70Z5PgJov7Dh2S0KIRWrrxvwSg/irMULjCX8gF+KA7fr+AqH2UTgRNzkreffUWUwK49sknc0uZH068sNT85vhQRdzVGRRHtAJt4Y++/k1vjKsqq75XNp3o9ldqZmDOB0OIaco; 3:POukKzlfCb96cKHYyrLto3GmFzWIp6JeVAoEqXNEOM2vMno+HCjkHdqLZPVOHLRNcxascP53bAOZp26pHntDZrKat2ftPQjfh4MOT2g/38Xe4pGZha9p/+e3pakzT02b/CO1QZMttkT44k0ObxIWCX9JOt+6wjaUFqkaM5yTw6MyPE46yLYPDwf6lnR5fZkzxwQ+fiLtAgqwKNh6SVdSI35dMfDr8bSylP/5p8Ykp/U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0714; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 25:QHn3u4ghWGFtWq2hLt8FUNFDN7iqzWLNOUcjpFDwIu4SW+sVZx0kU2iYDMm+4jZKNasdIpD/lo/5UjMylizhBpyjp5/ubiNMHxi5mtbql8gLBWv3D5RHtfQYhIB/gIkYETfQuyzpvXhFMhARbqBC9IoU5ZS4QVwIcjuqlQowDubsmow/f0MrwrwNHMGNiLLcfEOSYa31QapZsYTDsWn7KF8iHnYWLybIfOWrEQ8c9UR0sAQlLrDGwbQNtP5kR/5gUiqWdEkAaHY359O16JcTVPMbdsXBFKdTG3hUfV4PUJSRqYbIVOhujMgrAFPmLa7dLIZE52yjyCmbd7GJCbf8p8A+Ji+7PfiREfv26mGBtzPQejstIZQzVuAIC6pD0re853EWhnILfRe4R43B82wiAJT53x/DpauEJe+Aqx5jlNnrX3rC4InahLk1Met1fO+vgVWn7jgiSGMhEx/LakjNjUjC4dgP2LALo7nmMtgrCWHRUT/RsmIwNyMnQQVNWX+vlXnp416j3i3X3gS8GKSX5JiC/2mCOzB6p60PsGZ5XrELPvKbztOnSGdz2effykPVzQu4HzQCXPRV/qRpzqLCSc5i+zN/Y6FyDdxkLGXNpB4Qs8tNzGbOzODZilcV9R0RN3WJrtco3nrz7KF5lLRrmXtyVsfblZdNgs3Xc2O98xo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(8121501046)(5005006)(13017025)(13015025)(13023025)(13024025)(10201501046)(3002001)(6055026); SRVR:CY1PR0301MB0714; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0714; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 4:tGoEPpvwYGU35uDDnIqyTzXx1FIhVJZUcdUWCkfHjfE+gAyOIxUNzLo+Ay71q/c4dX1vAe38u804lPF/XYCuCmHpLEr542KFvu80TosR3Ko1+ida3l/Zw7H43fZx9zrFKsFehxm8EK6fBmiHfuTU5Eh22QdyDrsUX9SsdNdtmd8dDpzb3m9Tm9UvUEqYks9Nbq/e/LESD9DecABIIHjS2FyasSZwbaxAKl+mMpftd/QremPA7qJ7bHgnrLdVgOieWdXpF5kprWR/GKMbRf6htEiICDMM0Nlu3/+N32VC0kXkHCG8a90Hdq8gPN9VvD4d1sJK0D2R8GNYw52d1bm/iJYaW0L+8S5r1ICghj4G4u+10Uoh9rGcVEqdRmSFr4XmXwkUD4capVxZxoso8JAkPOhiLMnCwEGHsHLQ2WZhZuxAxYopjHDwqiqfdUoysM/gmaib0yWvFju1qUmJvg5TCGHwlXbcSliQfmuksaNsmtk= X-Forefront-PRVS: 0918748D70 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0714; 23:iAxE0nz8ryUCOUO8VreHZyfk+rYXtBxFOLRRmaJ?= =?us-ascii?Q?ui3avU6njZJyTnyg8eDy9MnvhC1LbsQ+nKXkLXEugIitdRONwU9AkBhljV6y?= =?us-ascii?Q?vCMcRwaIyjFNwtqGvGrxlR4I0+b7YPHwJoJ1lERyQBSmhd8EahOE1FivtVTE?= =?us-ascii?Q?U07+8KDs7oMT361VziQYVdGatbs4jaLlwgbfjlFYmqIDYViUfTWzUCcGVRcT?= =?us-ascii?Q?+4DiEXv2/PbYNXyPDDvl2jJZBIAnNAvfAIyP0OJXIUmJV1wMh11kDGnHD7hW?= =?us-ascii?Q?CUH/W4BAP/5qS9kQEv9d+zP16y088p31RDsIeCVqg7hGHZvkYUtIvnq61cW0?= =?us-ascii?Q?Q8hv7uBdOP/4XEB9XBec1zlqcK+JaC71slxaGwXPd1Dw3O3iIaNrwv2xF2+3?= =?us-ascii?Q?uX+Ay+lL3rK6k16U0QIHGcxaNTrq3VSk49KyFjlPEShKoLDpkDNmHJy2BcZv?= =?us-ascii?Q?DWVFJ36BaFN7ZsIWJjBp3GyEhcra2qwjlOYrHwpmwGkYgWAeiaesAebFU1LZ?= =?us-ascii?Q?fFODUQBaH+FhqeC/3lGbCKJgKvDUjSV9iClLUdA43veDCPPu7r3JPtSjm6tc?= =?us-ascii?Q?cE+Nyw35wTPHFkJw5tvVTH4IZSGfSIMnhioGau0HpGzOB3UEraCEjFx+Cv2w?= =?us-ascii?Q?/SwM9hUQOM1sz8mL2UfmCT6rx6goLrV5dY2hvT+QNIxSYeTj2fpoO8xq5QZS?= =?us-ascii?Q?CRcCtSnNrOU0nfsNaUaGWY/xMZfo5reN+h82RuS36jaMSesV2WWw7jaHkaPz?= =?us-ascii?Q?6zs6OyhnlOfWxVa5za3xdABpu0Fzt39FG8esxwhKQ5Jb/qUD53dRJRa3sxzC?= =?us-ascii?Q?3KPK8SEPlronLF1NFrB3+HdKach84RyJ7rGZk515FtkZ7sxt92sBZIyW36wC?= =?us-ascii?Q?0TNWsteWQPmnqJcWy/XmUu24rr47/9aqebmO/3IsbiD819rihJi+ObX2/AMV?= =?us-ascii?Q?8Ao/sAJP39DdaFxFxupbJeiRrp7kzW5gqeY1HKRMwyWpc85BMbqHJQMqm4hh?= =?us-ascii?Q?1a9wMtsZnW8s1m32TXBW5DTeQypVBCdJ9a8FVMzwkJoquQiZH8+j6qeMnFAE?= =?us-ascii?Q?EmgUEkrAao2UPY/zm6i9lo3c0UHj7t+AE1gB+2bGz5eTnzoqaovs9cxflH9f?= =?us-ascii?Q?lJVKF4VWwMQGhmbtSDThj5fM/kSRAiY5h9acu4cI71hcpoujejSJ++A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 5:jGCbtauHzCMCsWjy/4FjfUiiZ1Oj/kMtWnW7oaR05N5qDi5qk9VzjxggsCTSeTac0JoHu7Lm3g/TntLsBhXxciuV1NWphnhBBykBQfUKb2n8mxMibeVCVoDfnjnG10A4VxjG014XpC6JBvz07iWaPSrREjuZX74Oa/Hh3Q2I+CU=; 24:w9SZyjGyhihySQ2yoOVKGybbZR0aUZxjagBs9T1Ku6NE1YAZZZ8oZ5uMgWOKnzfgaQ56mGMfjU+RXR7Xnh8LrIHDo4tX5bFsrGmbF8Lhrbw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2016 16:59:02.6095 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0714 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP mmc_select_hs200() and mmc_select_hs() will keep the timing as before if switch fails. So it's meaningless to print the failed switched mode outside based on the current host timing. Furthermore, the original print is wrong, it should be: pr_warn("%s: switch to %s failed\n", mmc_hostname(card->host), mmc_card_hs(card) ? "high-speed" : (mmc_card_hs200(card) ? "hs200" : "")); Since we already have error message in mmc_select_hs200(), simply remove it outside. Signed-off-by: Dong Aisheng --- drivers/mmc/core/mmc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f6683a9..55c8201 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1321,21 +1321,13 @@ static int mmc_select_timing(struct mmc_card *card) if (err && err != -EBADMSG) return err; - if (err) { - pr_warn("%s: switch to %s failed\n", - mmc_card_hs(card) ? "high-speed" : - (mmc_card_hs200(card) ? "hs200" : ""), - mmc_hostname(card->host)); - err = 0; - } - bus_speed: /* * Set the bus speed to the selected bus timing. * If timing is not selected, backward compatible is the default. */ mmc_set_bus_speed(card); - return err; + return 0; } /*