summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-05-27 08:36:40 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2016-07-25 10:34:25 +0200
commitc0834a585f18d2de2dfbce600334b391c870a62d (patch)
tree13b423ba2268e6a012c0759dc5e8bd3d8418a7b8 /drivers
parentmmc: sh_mmcif: Use a 10s timeout in the error recovery path (diff)
downloadlinux-c0834a585f18d2de2dfbce600334b391c870a62d.tar.xz
linux-c0834a585f18d2de2dfbce600334b391c870a62d.zip
mmc: dw_mmc: remove redundant of set_bit and clear_bit
dw_mci_get_cd have already dealt with these for both of internal card-detect and gpio card-detect. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/dw_mmc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 801285801664..8a2dd0484c67 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2615,10 +2615,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
mmc->max_seg_size = mmc->max_req_size;
}
- if (dw_mci_get_cd(mmc))
- set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
- else
- clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
+ dw_mci_get_cd(mmc);
ret = mmc_add_host(mmc);
if (ret)