mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[linux-2.6-microblaze.git] / drivers / mmc / host / sdhci-s3c.c

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index d328fcf..cda83cc 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -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);