From patchwork Thu Nov 5 15:08:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 7562191 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 D505BBEEA4 for ; Thu, 5 Nov 2015 15:08:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3020E2085C for ; Thu, 5 Nov 2015 15:08:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48D362081F for ; Thu, 5 Nov 2015 15:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161580AbbKEPIO (ORCPT ); Thu, 5 Nov 2015 10:08:14 -0500 Received: from mail-lf0-f44.google.com ([209.85.215.44]:36338 "EHLO mail-lf0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161578AbbKEPIN (ORCPT ); Thu, 5 Nov 2015 10:08:13 -0500 Received: by lfs39 with SMTP id 39so28967795lfs.3 for ; Thu, 05 Nov 2015 07:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=XWIIazHMQ7zaVLX8sHE/lIi52fbV6p/rIlthU1i6KKY=; b=rlAkqKF90KeQpsqpCokDeebl+J8sm8ys0RBaK9CpPBkvx6g7JRXw8S0sasXFYMbntp 15wttTVqbcBRj9zwIQi17G868Bu0g82Z5Us8aBTwqcpRNFPOLemqmg7S8RbeYC9hXw+d qfwHuLQZdYvRuACRwAO6D/RPb5LYVvx1uFhdzVats/n5PraeA10mUevkCVmawJhlfWS+ LgsEYsil5w4s0RS1YSYeCkpXR8EW9VAeN6PMTMo1lTU51INdKugk19lUPWIVGH/9QNuc Q98KhotmzkSOC0QAdSZ6HsqDP/ehGlaIqze71YOS8xvXvg8JrwgUT0jysGAYuMHtq5+K 0a3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=XWIIazHMQ7zaVLX8sHE/lIi52fbV6p/rIlthU1i6KKY=; b=MGr1igzT+snmEwJTtbsxrDF3Ne1koEVC9WoqdX7jpcyiLnoxikUB559/WG8dhpKtrO 3nu3e/mxYLyukLjHQalMUZN6pYaHlJayFSr5G+3uQTYfUoPCQUL6Ek5QmiTKJvh0qXjZ vgmmgRjFdvFnWqwuv8C6nWom3h791GsDCd/UrtEt1T1pamSpy4N8s/Kddf3/snHOVKfE 5ZRXe9zl+u1D72qrPlmbO1MmUK0H1n7/yAunF8sa6wfi6ztsJnZBv4ns1OkryAMeCc3J 19DzQ6A47vKDq+g5sH0JnWyft4bD0M8FQKORpPS4Gsav0fa0fH3mtyxwjTf051VQBJbP hxuA== X-Gm-Message-State: ALoCoQmkGzl95gjbrp+M/lkW/rhI4L4W2jwwBP5CNRWx/ienO2bTaFpQ9uMC91ys/Fy1sRAPSW4q X-Received: by 10.25.13.74 with SMTP id 71mr2304508lfn.113.1446736091391; Thu, 05 Nov 2015 07:08:11 -0800 (PST) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id f198sm1044405lff.9.2015.11.05.07.08.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 07:08:10 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/2] mmc: core: Invoke ->card_event() callback only when needed Date: Thu, 5 Nov 2015 16:08:07 +0100 Message-Id: <1446736088-11715-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 The ->card_event() callback may be called when re-scan is disabled and for non-removable cards, which both cases are unnecessary. Instead let's move the call later in mmc_rescan() where these constraints have been validated. Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 5ae89e4..c1027a4 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2567,11 +2567,6 @@ void mmc_rescan(struct work_struct *work) container_of(work, struct mmc_host, detect.work); int i; - if (host->trigger_card_event && host->ops->card_event) { - host->ops->card_event(host); - host->trigger_card_event = false; - } - if (host->rescan_disable) return; @@ -2580,6 +2575,11 @@ void mmc_rescan(struct work_struct *work) return; host->rescan_entered = 1; + if (host->trigger_card_event && host->ops->card_event) { + host->ops->card_event(host); + host->trigger_card_event = false; + } + mmc_bus_get(host); /*