diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-05 08:34:47 -0500 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:18 -0500 |
commit | c5f4bc841cd1c59d91258c1268e4cbb29f14ee6a (patch) | |
tree | 813fe42350d5aca53e1124df4b661802a03e07e0 | |
parent | c1b55bfcb3e5599eb5e67efed70698ade02add4e (diff) |
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>
-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 { | |||
73 | bool wp_inverted; | 73 | bool wp_inverted; |
74 | bool cd_inverted; | 74 | bool cd_inverted; |
75 | bool broken_cd; | 75 | bool broken_cd; |
76 | bool non_removable; | ||
77 | }; | 76 | }; |
78 | 77 | ||
79 | static int mxs_mmc_get_ro(struct mmc_host *mmc) | 78 | static int mxs_mmc_get_ro(struct mmc_host *mmc) |
@@ -97,7 +96,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) | |||
97 | struct mxs_mmc_host *host = mmc_priv(mmc); | 96 | struct mxs_mmc_host *host = mmc_priv(mmc); |
98 | struct mxs_ssp *ssp = &host->ssp; | 97 | struct mxs_ssp *ssp = &host->ssp; |
99 | 98 | ||
100 | return host->non_removable || host->broken_cd || | 99 | return host->broken_cd || |
101 | !(readl(ssp->base + HW_SSP_STATUS(ssp)) & | 100 | !(readl(ssp->base + HW_SSP_STATUS(ssp)) & |
102 | BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; | 101 | BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; |
103 | } | 102 | } |
@@ -654,8 +653,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) | |||
654 | else if (bus_width == 8) | 653 | else if (bus_width == 8) |
655 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; | 654 | mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; |
656 | host->broken_cd = of_property_read_bool(np, "broken-cd"); | 655 | host->broken_cd = of_property_read_bool(np, "broken-cd"); |
657 | host->non_removable = of_property_read_bool(np, "non-removable"); | 656 | if (of_property_read_bool(np, "non-removable")) |
658 | if (host->non_removable) | ||
659 | mmc->caps |= MMC_CAP_NONREMOVABLE; | 657 | mmc->caps |= MMC_CAP_NONREMOVABLE; |
660 | host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags); | 658 | host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags); |
661 | if (flags & OF_GPIO_ACTIVE_LOW) | 659 | if (flags & OF_GPIO_ACTIVE_LOW) |