mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe (15064119) · Commits · 戴 / test

mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it suits only for the dt case. Signed-off-by:

drivers/mmc/host/sdhci-esdhc-imx.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -903,7 +903,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,

		mmc_of_parse_voltage(np, &host->ocr_mask);

		return 0;
		/* call to generic mmc_of_parse to support additional capabilities */
		return mmc_of_parse(host->mmc);
		}
		#else
		static inline int
		@@ -1048,11 +1049,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
		host->quirks2 \|= SDHCI_QUIRK2_NO_1_8_V;
		}

		/* call to generic mmc_of_parse to support additional capabilities */
		err = mmc_of_parse(host->mmc);
		if (err)
		goto disable_clk;

		err = sdhci_add_host(host);
		if (err)
		goto disable_clk;