Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860951c5 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

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: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 52c0624a

drivers/mmc/host/dw_mmc.c

+1 −2
Original line number Diff line number Diff line
@@ -1451,8 +1451,7 @@ static int dw_mci_get_cd(struct mmc_host *mmc) 
	int gpio_cd = mmc_gpio_get_cd(mmc);



	/* Use platform get_cd function, else try onboard card detect */

	if ((mmc->caps & MMC_CAP_NEEDS_POLL) ||

	    (mmc->caps & MMC_CAP_NONREMOVABLE))

	if ((mmc->caps & MMC_CAP_NEEDS_POLL) || !mmc_card_is_removable(mmc))

		present = 1;

	else if (gpio_cd >= 0)

		present = gpio_cd;

drivers/mmc/host/mxcmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static int mxcmci_probe(struct platform_device *pdev) 


	if (pdata)

		dat3_card_detect = pdata->dat3_card_detect;

	else if (!(mmc->caps & MMC_CAP_NONREMOVABLE)

	else if (mmc_card_is_removable(mmc)

			&& !of_property_read_bool(pdev->dev.of_node, "cd-gpios"))

		dat3_card_detect = true;

drivers/mmc/host/sdhci-bcm-kona.c

+3 −3
Original line number Diff line number Diff line
@@ -264,12 +264,12 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) 
	}



	dev_dbg(dev, "non-removable=%c\n",

		(host->mmc->caps & MMC_CAP_NONREMOVABLE) ? 'Y' : 'N');

		mmc_card_is_removable(host->mmc) ? 'N' : 'Y');

	dev_dbg(dev, "cd_gpio %c, wp_gpio %c\n",

		(mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N',

		(mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N');



	if (host->mmc->caps & MMC_CAP_NONREMOVABLE)

	if (!mmc_card_is_removable(host->mmc))

		host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;



	dev_dbg(dev, "is_8bit=%c\n",
@@ -288,7 +288,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) 
	}



	/* if device is eMMC, emulate card insert right here */

	if (host->mmc->caps & MMC_CAP_NONREMOVABLE) {

	if (!mmc_card_is_removable(host->mmc)) {

		ret = sdhci_bcm_kona_sd_card_emulate(host, 1);

		if (ret) {

			dev_err(dev,

drivers/mmc/host/sdhci-of-at91.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int sdhci_at91_probe(struct platform_device *pdev) 
	 * Disable SDHCI_QUIRK_BROKEN_CARD_DETECTION to be sure nobody tries

	 * to enable polling via device tree with broken-cd property.

	 */

	if (!(host->mmc->caps & MMC_CAP_NONREMOVABLE) &&

	if (mmc_card_is_removable(host->mmc) &&

	    mmc_gpio_get_cd(host->mmc) < 0) {

		host->mmc->caps |= MMC_CAP_NEEDS_POLL;

		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;

drivers/mmc/host/sdhci-st.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void st_mmcss_cconfig(struct device_node *np, struct sdhci_host *host) 


	writel_relaxed(cconf2, host->ioaddr + ST_MMC_CCONFIG_REG_2);



	if (mhost->caps & MMC_CAP_NONREMOVABLE)

	if (!mmc_card_is_removable(mhost))

		cconf3 |= ST_MMC_CCONFIG_EMMC_SLOT_TYPE;

	else

		/* CARD _D ET_CTRL */