Commit 5ec35820 authored Feb 04, 2015 by Kevin Hao Committed by Ulf Hansson Mar 23, 2015

mmc: sdhci-pltfm: remove the unneeded check of disabled device



Since commit cd1e6504 ("of/device: Don't register disabled
devices"), the disabled device will not be registered at all. So
we don't need to do the check again in the platform device driver.

And the check in the current code is useless even if we really
run into a disabled device. In this case, it just doesn't parse
the dtb for the infos such as quirks or clock, but it will continue
to try to init the disabled device after that check. So just remove it.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 01df7ecd

drivers/mmc/host/sdhci-pltfm.c

+26 −28

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ void sdhci_get_of_property(struct platform_device *pdev)
		u32 bus_width;
		int size;

		if (of_device_is_available(np)) {
		if (of_get_property(np, "sdhci,auto-cmd12", NULL))
		host->quirks \|= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;

		@@ -112,7 +111,6 @@ void sdhci_get_of_property(struct platform_device *pdev)
		if (of_find_property(np, "enable-sdio-wakeup", NULL))
		host->mmc->pm_caps \|= MMC_PM_WAKE_SDIO_IRQ;
		}
		}
		#else
		void sdhci_get_of_property(struct platform_device *pdev) {}
		#endif /* CONFIG_OF */

Admin message