diff options
| author | Jaehoon Chung | 2016-06-21 03:13:26 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2016-07-25 10:34:21 +0200 |
| commit | 860951c5f0f5caf595799d98b93a8304bf70f08d (patch) | |
| tree | 4045b6bf6aa9dd449920fa7e3315171d4100efec /drivers/mmc/host/sdhci.c | |
| parent | phy: rockchip-emmc: Set phyctrl_frqsel based on card clock (diff) | |
| download | kernel-qcow2-linux-860951c5f0f5caf595799d98b93a8304bf70f08d.tar.gz kernel-qcow2-linux-860951c5f0f5caf595799d98b93a8304bf70f08d.tar.xz kernel-qcow2-linux-860951c5f0f5caf595799d98b93a8304bf70f08d.zip | |
mmc: host: use the defined function to check whether card is removable
In linux/mmc/host.h, mmc_card_is_removable() is already defined.
It should be maintainted more easier than now.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 702a245ce2e6..cdcaba27c163 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -117,7 +117,7 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) u32 present; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) || - (host->mmc->caps & MMC_CAP_NONREMOVABLE)) + !mmc_card_is_removable(host->mmc)) return; if (enable) { @@ -1617,7 +1617,7 @@ static int sdhci_get_cd(struct mmc_host *mmc) return 0; /* If nonremovable, assume that the card is always present. */ - if (host->mmc->caps & MMC_CAP_NONREMOVABLE) + if (!mmc_card_is_removable(host->mmc)) return 1; /* @@ -3089,7 +3089,7 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && - !(mmc->caps & MMC_CAP_NONREMOVABLE) && + mmc_card_is_removable(mmc) && mmc_gpio_get_cd(host->mmc) < 0) mmc->caps |= MMC_CAP_NEEDS_POLL; |