drm/exynos: hdmi: Add CONFIG_OF and use of_match_ptr() macro

Add CONFIG_OF to compile conditionally. of_match_ptr eliminates having
an #ifdef returning NULL for the case when OF is disabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
index 37e6ec704e1d05117324922ff31da960928be536..bef43e0342a69e82dcb7e91756158552c6ca8159 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/drivers/gpu/drm/exynos/exynos_ddc.c
@@ -48,6 +48,7 @@ static struct i2c_device_id ddc_idtable[] = {
        { },
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmiddc_match_types[] = {
        {
                .compatible = "samsung,exynos5-hdmiddc",
@@ -55,12 +56,13 @@ static struct of_device_id hdmiddc_match_types[] = {
                /* end node */
        }
 };
+#endif
 
 struct i2c_driver ddc_driver = {
        .driver = {
                .name = "exynos-hdmiddc",
                .owner = THIS_MODULE,
-               .of_match_table = hdmiddc_match_types,
+               .of_match_table = of_match_ptr(hdmiddc_match_types),
        },
        .id_table       = ddc_idtable,
        .probe          = s5p_ddc_probe,

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 68936e6aa6ab0c286d8d05b91e672610ad121921..e009216e4a3c6004ed57eb6ef4adf55249c583d4 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -2440,6 +2440,7 @@ static struct platform_device_id hdmi_driver_types[] = {
        }
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmi_match_types[] = {
        {
                .compatible = "samsung,exynos5-hdmi",
@@ -2448,6 +2449,7 @@ static struct of_device_id hdmi_match_types[] = {
                /* end node */
        }
 };
+#endif
 
 static int __devinit hdmi_probe(struct platform_device *pdev)
 {
@@ -2710,6 +2712,6 @@ struct platform_driver hdmi_driver = {
                .name   = "exynos-hdmi",
                .owner  = THIS_MODULE,
                .pm     = &hdmi_pm_ops,
-               .of_match_table = hdmi_match_types,
+               .of_match_table = of_match_ptr(hdmi_match_types),
        },
 };

diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
index 27d1720f1bbdc627f4acd45629c4e094ea24218a..6206056f4a3328b7b4e5e58b78e64140a0b32bcc 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
@@ -46,6 +46,7 @@ static const struct i2c_device_id hdmiphy_id[] = {
        { },
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmiphy_match_types[] = {
        {
                .compatible = "samsung,exynos5-hdmiphy",
@@ -53,12 +54,13 @@ static struct of_device_id hdmiphy_match_types[] = {
                /* end node */
        }
 };
+#endif
 
 struct i2c_driver hdmiphy_driver = {
        .driver = {
                .name   = "exynos-hdmiphy",
                .owner  = THIS_MODULE,
-               .of_match_table = hdmiphy_match_types,
+               .of_match_table = of_match_ptr(hdmiphy_match_types),
        },
        .id_table = hdmiphy_id,
        .probe          = hdmiphy_probe,