Skip to content

Commit

Permalink
mmc: mxs: use standard flag for non-removable status
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sascha Hauer authored and Chris Ball committed Jan 13, 2014
1 parent c1b55bf commit c5f4bc8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/mmc/host/mxs-mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c5f4bc8

Please sign in to comment.