mmc: tmio: move mmc_gpio_request_cd() before mmc_add_host() (cd82cd21) · Commits · 戴 / test

Drivers do not need to call mmc_gpiod_request_cd_irq() explicitly because mmc_start_host() calls it. To make it work, cd_gpio must be set before mmc_add_host(). Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by:

Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/tmio_mmc_core.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -1205,6 +1205,12 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
		if (ret < 0)
		return ret;

		if (pdata->flags & TMIO_MMC_USE_GPIO_CD) {
		ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0);
		if (ret)
		return ret;
		}

		mmc->caps \|= MMC_CAP_4_BIT_DATA \| pdata->capabilities;
		mmc->caps2 \|= pdata->capabilities2;
		mmc->max_segs = pdata->max_segs ? : 32;
		@@ -1300,14 +1306,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,

		dev_pm_qos_expose_latency_limit(&pdev->dev, 100);

		if (pdata->flags & TMIO_MMC_USE_GPIO_CD) {
		ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0);
		if (ret)
		goto remove_host;

		mmc_gpiod_request_cd_irq(mmc);
		}

		return 0;

		remove_host:

Admin message