diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-05 14:34:47 +0100 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:18 -0500 |
| commit | c5f4bc841cd1c59d91258c1268e4cbb29f14ee6a (patch) | |
| tree | 813fe42350d5aca53e1124df4b661802a03e07e0 /drivers/mmc | |
| parent | c1b55bfcb3e5599eb5e67efed70698ade02add4e (diff) | |
| download | linux-c5f4bc841cd1c59d91258c1268e4cbb29f14ee6a.tar.bz2 | |
mmc: mxs: use standard flag for non-removable status
The standard caps already have a MMC_CAP_NONREMOVABLE flag. Use it
rather than a custom non_removable flag.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 50fc9df791b2..374fca723607 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -73,7 +73,6 @@ struct mxs_mmc_host { bool wp_inverted; bool cd_inverted; bool broken_cd; - bool non_removable; }; static int mxs_mmc_get_ro(struct mmc_host *mmc) @@ -97,7 +96,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->non_removable || host->broken_cd || + return host->broken_cd || !(readl(ssp->base + HW_SSP_STATUS(ssp)) & BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; } @@ -654,8 +653,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) 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"); - host->non_removable = of_property_read_bool(np, "non-removable"); - if (host->non_removable) + 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); if (flags & OF_GPIO_ACTIVE_LOW) |