mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs (3a8e9cad) · Commits · 戴 / test

Support for non-dt based initialization for Exynos SoCs has been removed, so there is no need to keep driver IDs for this case. While touching this, replace odd conditional code for instantiating driver data for Exynos4 SoCs with a simple reference and move that driver data under CONFIG_OF. Signed-off-by:

Marek Szyprowski <m.szyprowski@samsung.com> Acked-by:

Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by:

Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/sdhci-s3c.c

+5 −13

Original line number	Diff line number	Diff line
		@@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
		NULL)
		};

		#if defined(CONFIG_CPU_EXYNOS4210) \|\| defined(CONFIG_SOC_EXYNOS4212)
		static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
		.no_divider = true,
		};
		#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
		#else
		#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
		#endif

		static const struct platform_device_id sdhci_s3c_driver_ids[] = {
		{
		.name = "s3c-sdhci",
		.driver_data = (kernel_ulong_t)NULL,
		}, {
		.name = "exynos4-sdhci",
		.driver_data = EXYNOS4_SDHCI_DRV_DATA,
		},
		{ }
		};
		MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);

		#ifdef CONFIG_OF
		static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
		.no_divider = true,
		};

		static const struct of_device_id sdhci_s3c_dt_match[] = {
		{ .compatible = "samsung,s3c6410-sdhci", },
		{ .compatible = "samsung,exynos4210-sdhci",
		.data = (void *)EXYNOS4_SDHCI_DRV_DATA },
		.data = &exynos4_sdhci_drv_data },
		{},
		};
		MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);

Admin message