From patchwork Thu Nov 5 15:21:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 7562231 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 64A369F36A for ; Thu, 5 Nov 2015 15:21:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 808B720874 for ; Thu, 5 Nov 2015 15:21:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCB9C20863 for ; Thu, 5 Nov 2015 15:21:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161579AbbKEPVt (ORCPT ); Thu, 5 Nov 2015 10:21:49 -0500 Received: from mail-lf0-f42.google.com ([209.85.215.42]:33671 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754933AbbKEPVt (ORCPT ); Thu, 5 Nov 2015 10:21:49 -0500 Received: by lfbf136 with SMTP id f136so59011354lfb.0 for ; Thu, 05 Nov 2015 07:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=OryjBVIAG4VQNmY9GehSE/b3zwxyXtJmDo1m+5d2Twk=; b=ok0KmTWgMelegBlYWe3U43U0u9AjwtW9gywNwgm+TEGLUlkoJeLtVg2Ef5h8muDhpN sT42IU45aRTvjBapq+UnVciQ2ibSMKDLAnDYOLll2UaJKXC9Q5UpPhUR9ncpHFjjBaNp Xu8hIuyIgKHmVjqaakg3CGxW+lNnWpWMhSTh6fx/32NjdeNRvghknWtGJNMYmqGiFj8P CKY3/WnmnCXPHSIMyyofx3qmol3JBKALhdicTPxEplSmiNzAZTX7qAOZiT++kWoWxaXA FDAwptV4UsRfhrRgby3OnJ50gchO6wqGfIkTOZm+RIoxDBO9yVGCP6LSpd2Mp7NvW8DG jMPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OryjBVIAG4VQNmY9GehSE/b3zwxyXtJmDo1m+5d2Twk=; b=J7rmQMyg6TwJRxEYJxRPLU33ifngmqr6slUCjO2GIP5AWrnIvPgL7nEA69zNxbyLve bEbbX0lr2Jb3IKH5b9mumjgbCLmmjGI7tAZvrhJk9s4tX06Z3nYQjLdvcFPWyp6C39P3 SPITDShE18cRrTT4yJ/jeeIvBnM7sKcBBBFSIZ9slzsLcU+iGkf/GVUHYuQp8EkynpKQ fdrx0AsZb8VunbpxoHai+ic3+Spa45XhiuRVN3Vy/DYsptxDp857JiIAib6xgdqoiAOx fHEKAW1SXYSmCqGpcwAtOJKERwdsKI0lvNLBFE0iPFf/cOlmcnuQg6+/Zo0BiUaw6lBi iZvQ== X-Gm-Message-State: ALoCoQnELsvJgl0r7RTiU/fWT91rHBiip+Ykq0SFF3SdeBYCFXqzbvX3+zd+tkwAMfg0ZJvP0ZIK X-Received: by 10.25.206.16 with SMTP id e16mr2304430lfg.39.1446736907298; Thu, 05 Nov 2015 07:21:47 -0800 (PST) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id f138sm1053720lfd.6.2015.11.05.07.21.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 07:21:46 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Adrian Hunter Subject: [PATCH] mmc: core: Check for non-removable cards earlier in the error path Date: Thu, 5 Nov 2015 16:21:39 +0100 Message-Id: <1446736899-21542-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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_detect_card_removed() validates that the card is removable, but when being called via the bus_ops ->detect() callbacks, the validation is redundant as it's already done in mmc_rescan(). Move the validation of a removable card to the mmc_detect_card_removed() API, which is where it's applicable, to allow the blk error recovery path to get the response a bit earlier. Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 5ae89e4..34243f7 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2498,9 +2498,6 @@ int _mmc_detect_card_removed(struct mmc_host *host) { int ret; - if (host->caps & MMC_CAP_NONREMOVABLE) - return 0; - if (!host->card || mmc_card_removed(host->card)) return 1; @@ -2536,6 +2533,9 @@ int mmc_detect_card_removed(struct mmc_host *host) if (!card) return 1; + if (host->caps & MMC_CAP_NONREMOVABLE) + return 0; + ret = mmc_card_removed(card); /* * The card will be considered unchanged unless we have been asked to