Commit c5f4bc84 authored by Sascha Hauer's avatar Sascha Hauer Committed by Chris Ball

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c1b55bfc
...@@ -73,7 +73,6 @@ struct mxs_mmc_host { ...@@ -73,7 +73,6 @@ struct mxs_mmc_host {
bool wp_inverted; bool wp_inverted;
bool cd_inverted; bool cd_inverted;
bool broken_cd; bool broken_cd;
bool non_removable;
}; };
static int mxs_mmc_get_ro(struct mmc_host *mmc) 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,7 +96,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_mmc_host *host = mmc_priv(mmc);
struct mxs_ssp *ssp = &host->ssp; struct mxs_ssp *ssp = &host->ssp;
return host->non_removable || host->broken_cd || return host->broken_cd ||
!(readl(ssp->base + HW_SSP_STATUS(ssp)) & !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
} }
...@@ -654,8 +653,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) ...@@ -654,8 +653,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
else if (bus_width == 8) else if (bus_width == 8)
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
host->broken_cd = of_property_read_bool(np, "broken-cd"); host->broken_cd = of_property_read_bool(np, "broken-cd");
host->non_removable = of_property_read_bool(np, "non-removable"); if (of_property_read_bool(np, "non-removable"))
if (host->non_removable)
mmc->caps |= MMC_CAP_NONREMOVABLE; mmc->caps |= MMC_CAP_NONREMOVABLE;
host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags); host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
if (flags & OF_GPIO_ACTIVE_LOW) if (flags & OF_GPIO_ACTIVE_LOW)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment