diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-05 14:34:48 +0100 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-13 18:48:19 +0100 |
| commit | a91fe279ae750d67d65039bb4ac2cc6ef51e7a2a (patch) | |
| tree | 76f344ad9b8ec85de85c7e16fe4f1c2f44a6fcfd | |
| parent | mmc: mxs: use standard flag for non-removable status (diff) | |
| download | linux-a91fe279ae750d67d65039bb4ac2cc6ef51e7a2a.tar.xz linux-a91fe279ae750d67d65039bb4ac2cc6ef51e7a2a.zip | |
mmc: mxs: use standard flag for broken card detection
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 374fca723607..02210ce8025e 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); |