From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] mmc: mxs: use standard flag for broken card detection
Date: Thu, 5 Dec 2013 14:34:48 +0100 [thread overview]
Message-ID: <1386250491-4708-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1386250491-4708-1-git-send-email-s.hauer@pengutronix.de>
Use the standard MMC_CAP_NEEDS_POLL flag rather than a custom broken_cd
flag. The original code used to just return true in the card detection
function for broken card detection. The MMC_CAP_NEEDS_POLL works different,
but was introduced for the same purpose, so assume the code works correct
now.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mmc/host/mxs-mmc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 374fca7..02210ce 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -72,7 +72,6 @@ struct mxs_mmc_host {
int wp_gpio;
bool wp_inverted;
bool cd_inverted;
- bool broken_cd;
};
static int mxs_mmc_get_ro(struct mmc_host *mmc)
@@ -96,8 +95,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
struct mxs_mmc_host *host = mmc_priv(mmc);
struct mxs_ssp *ssp = &host->ssp;
- return host->broken_cd ||
- !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
}
@@ -652,7 +650,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
mmc->caps |= MMC_CAP_4_BIT_DATA;
else if (bus_width == 8)
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
- host->broken_cd = of_property_read_bool(np, "broken-cd");
+ if (of_property_read_bool(np, "broken-cd"))
+ mmc->caps |= MMC_CAP_NEEDS_POLL;
if (of_property_read_bool(np, "non-removable"))
mmc->caps |= MMC_CAP_NONREMOVABLE;
host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
--
1.8.4.3
next prev parent reply other threads:[~2013-12-05 13:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 13:34 mmc: mxs: Use mmc_of_parse Sascha Hauer
2013-12-05 13:34 ` [PATCH 1/6] mmc: Do not call get_cd for non removable cards Sascha Hauer
2013-12-06 8:31 ` Ulf Hansson
2013-12-05 13:34 ` [PATCH 2/6] mmc: mxs: use standard flag for non-removable status Sascha Hauer
2013-12-05 13:34 ` Sascha Hauer [this message]
2013-12-05 13:34 ` [PATCH 4/6] mmc: mxs: use standard flag for cd inverted Sascha Hauer
2013-12-05 13:34 ` [PATCH 5/6] mmc: mxs: use mmc_gpio_get_ro for detecting read-only status Sascha Hauer
2013-12-05 13:34 ` [PATCH 6/6] mmc: mxs: use mmc_of_parse to parse devicetree properties Sascha Hauer
2013-12-12 1:39 ` mmc: mxs: Use mmc_of_parse Chris Ball
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=1386250491-4708-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.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).