From patchwork Fri Oct 11 07:11:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 175920 Delivered-To: patches@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp371006ill; Fri, 11 Oct 2019 00:11:29 -0700 (PDT) X-Received: by 2002:a2e:a179:: with SMTP id u25mr2752392ljl.33.1570777889087; Fri, 11 Oct 2019 00:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570777889; cv=none; d=google.com; s=arc-20160816; b=AMgtq7sKPSjknkv4siS/Jqq+mihSOYNznv8/MmY8sMQlVyhyIL0TNScq0FiYpqvWSV rj9upycbZrs52HLFPWp8h1eTVX+KfzhX73nlioWIynG8lAYfc2V25IEwoCSSKET5R1Dp OTY19WlKEfgsEu1/fJqpJgXDJx+BfgBWTxsaYR8cOyn5GT23nb9dVN2J4jc5qVKthlrs /t1xyuSVHyNx9g5f1ZlTXmOpypvR5KXYoc14hD7XkSYFrcz19v3MS1YYs/HyGcDwTxzd iCUAQCv92e9pa8Jr+XWNLA/gnEPcR4jw/IWpDgNdctZsI5RUE8/DlpIQwHZNL8wxH1XO 4DiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=W/IUaSbhHG4wv7nj6S/SBAPb0kMokkckyKlISAFdDyg=; b=Vpz0Ewd1oavEYRebm0u+aom7Q/irwLGXJXweXh36qoU9yoX24+KQbMccCqT4NeLiUb 5D7FuHyWu3QKJtOW4g3c5tKj7uDer9drvvt5/0GLz54zcb8fMPbfQWfp7khmT/XEWkHU vIv09DiGeS5dromQWFJ0JSLEqBaeglNtXbx8Lk/RZuSQBPvIhrElgDeG7wmQ4drmZxni sbtiuJ7pDaAFtE68dRjWlYr37qW6A+9hvvEc4ky5YFWon3mMKb+7svi0gSmGs9yS5J63 SGwQgu+6BMRQKHNP7XMCkYp7NiR2AUKXKzgsJKMpdI+BglyLccrvb5kkk/rkZlmE4B2f dvsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mu/UZwsq"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a15sor2542514lff.72.2019.10.11.00.11.28 for (Google Transport Security); Fri, 11 Oct 2019 00:11:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mu/UZwsq"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=W/IUaSbhHG4wv7nj6S/SBAPb0kMokkckyKlISAFdDyg=; b=mu/UZwsq6JR4fwUjD0AaS4t9e+7DJgs3F8kLt3gqzC4qvzmN8mIH1Kdl1476SAPJj3 /IXDqHQnhJ5GTyVDoSdodwaWYXsOY7AaRs5acSou4bwkQABWUKLSlIrN1e26qu8RXPVn Oo6fJmvoN6ckGnxVuXluMoBR4BGBFt/NqwKwT/X5d58BxjY/vcW3E8klFGCxWWZu8B4f OWw+WfX7d8V9H41SZJQ7UfZbONZiHbmgIOLODV4fbZGKIaAkMyvCQiu77UgKKuKwK2OD B08xje+R76B3qRXEW8OhGOZbnnDKOAstrWpR6fwcIblE2AlncwFLWB25BUcOG/0O+acY frKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=W/IUaSbhHG4wv7nj6S/SBAPb0kMokkckyKlISAFdDyg=; b=OTzJOz+bk3t6EuSWswOOg0mMdBZpk5TRRIiPIbhzx7XzI59E0AfvTGxq9FlzQGXPE2 mvkELlM6ZaMiP7vLHAgN3OP6/usAFz2wq+pIqqdkIvoszIs5/9jXxR9H5t3wyhizdEPV Wg6rH40wwa3h3Rqjqy4fjpnxZMTC8Pgc4LjuRS/Fk9dkUJLOwGR5H6t9gbdJYLkmjG+1 6a5t9fgEYVGY0PHxp1/PYVP544I0xSIgyGgGH2oTMUceehJKaNZ8Kr0e1XXgj/3Jx0LT cVTUAcZMaeBsPo/6p9SxK6PWQ0BdGrVK7EgsgbJG/79MTs7RcEU0CYQAv2G3HVKAa5QU etBQ== X-Gm-Message-State: APjAAAViTQddPfWU2bmtJb5xqAd4ZrXIOhHuaQCK+MUYbfQcyQUl8VB0 uo5vDIIJQX50qYeLnkUY4ROsnujd X-Google-Smtp-Source: APXvYqyCu5wpFqB25B07RmvOOPYLsj0+kPemE0riq7UNx55YJT+idjda0EcAYV4e0ctB3wgF/b0INQ== X-Received: by 2002:a19:a40b:: with SMTP id q11mr7519779lfc.45.1570777888624; Fri, 11 Oct 2019 00:11:28 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id r6sm1834447ljr.77.2019.10.11.00.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 00:11:28 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Adrian Hunter , Douglas Anderson Cc: Matthias Kaehlcke , Ulf Hansson Subject: [PATCH] mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan() Date: Fri, 11 Oct 2019 09:11:17 +0200 Message-Id: <20191011071117.15294-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 Upfront in mmc_rescan() we use the host->rescan_entered flag, to allow scanning only once for non-removable cards. Therefore, it's also not possible that we can have bus attached, when we are scanning non-removable cards. For this reason, let' drop the check for mmc_card_is_removable() as it's redundant. Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 221127324709..6f8342702c73 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2297,11 +2297,8 @@ void mmc_rescan(struct work_struct *work) mmc_bus_get(host); - /* - * if there is a _removable_ card registered, check whether it is - * still present - */ - if (host->bus_ops && !host->bus_dead && mmc_card_is_removable(host)) + /* Verify a registered card to be functional, else remove it. */ + if (host->bus_ops && !host->bus_dead) host->bus_ops->detect(host); host->detect_change = 0;