From: Johan Rudholm Date: Mon, 28 Jan 2013 14:08:24 +0000 (+0100) Subject: mmc: sd: Simplify by using mmc_host_uhs X-Git-Tag: next-20130218~55^2~20 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ebfed332d1f7bdc20c7448d8e2b9484664029511;p=karo-tx-linux.git mmc: sd: Simplify by using mmc_host_uhs Signed-off-by: Johan Rudholm Acked-by: Ulf Hansson Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 74972c241dff..937363948079 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -444,8 +444,7 @@ static void sd_update_bus_speed_mode(struct mmc_card *card) * If the host doesn't support any of the UHS-I modes, fallback on * default speed. */ - if (!(card->host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | - MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) { + if (!mmc_host_uhs(card->host)) { card->sd_bus_speed = 0; return; } @@ -736,8 +735,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) * If the host supports one of UHS-I modes, request the card * to switch to 1.8V signaling level. */ - if (host->caps & (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | - MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50)) + if (mmc_host_uhs(host)) ocr |= SD_OCR_S18R; /*