From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Douglas Anderson <dianders@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>
Cc: Kalle Valo <kvalo@codeaurora.org>,
Tony Lindgren <tony@atomide.com>, Wen Gong <wgong@codeaurora.org>,
Erik Stromdahl <erik.stromdahl@gmail.com>,
Eyal Reizer <eyalreizer@gmail.com>,
linux-wireless@vger.kernel.org
Subject: [PATCH v2 2/3] mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan()
Date: Sat, 9 Nov 2019 11:30:45 +0100 [thread overview]
Message-ID: <20191109103046.26445-3-ulf.hansson@linaro.org> (raw)
In-Reply-To: <20191109103046.26445-1-ulf.hansson@linaro.org>
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 a corresponding card bus attached (host->bus_ops
is NULL), when we are scanning non-removable cards.
For this reason, let' drop the check for mmc_card_is_removable() as it's
redundant.
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/core/core.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
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;
--
2.17.1
next prev parent reply other threads:[~2019-11-09 10:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 10:30 [PATCH v2 0/3] mmc: Fixup HW reset for SDIO cards Ulf Hansson
2019-11-09 10:30 ` [PATCH v2 1/3] mwifiex: Re-work support for SDIO HW reset Ulf Hansson
2019-11-12 0:33 ` Doug Anderson
2019-11-12 12:13 ` Ulf Hansson
2019-11-12 18:04 ` Doug Anderson
2019-11-13 15:00 ` Ulf Hansson
2019-11-09 10:30 ` Ulf Hansson [this message]
2019-11-09 10:30 ` [PATCH v2 3/3] mmc: core: Re-work HW reset for SDIO cards Ulf Hansson
2019-11-12 0:33 ` Doug Anderson
2019-11-12 12:19 ` Ulf Hansson
2019-11-20 6:28 ` Kalle Valo
[not found] ` <87zhgr5af6.fsf@codeaurora.org>
2019-11-20 7:10 ` wgong
[not found] ` <6e6b53b28581a8f1a2944ca0bc65311e@codeaurora.org>
2019-11-20 7:20 ` Kalle Valo
[not found] ` <0101016e87aeb8b6-761ad812-5da7-4b0d-8cae-c69633d90de0-000000@us-west-2.amazonses.com>
2019-11-20 12:10 ` Ulf Hansson
2019-11-20 16:41 ` Kalle Valo
[not found] ` <87zhgqmref.fsf@kamboji.qca.qualcomm.com>
2019-11-21 2:29 ` wgong
2019-11-11 22:08 ` [PATCH v2 0/3] mmc: Fixup " Tony Lindgren
2019-11-12 12:23 ` Ulf Hansson
2019-11-12 18:00 ` Tony Lindgren
2019-11-12 0:51 ` Doug Anderson
2019-11-12 12:27 ` Ulf Hansson
2019-11-12 17:42 ` Doug Anderson
2019-11-13 15:11 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191109103046.26445-3-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=dianders@chromium.org \
--cc=erik.stromdahl@gmail.com \
--cc=eyalreizer@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mka@chromium.org \
--cc=tony@atomide.com \
--cc=wgong@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).