drm/exynos/hdmi: remove old platform data code

s5p_hdmi_platform_data were used before device tree introduction.
As HDMI driver is DT only we can drop this struct completely.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 4a00990e4ae4e8459b94a9a007044af1cc11af62..3cf09bb995a39c26720014d80725a6c43894ce53 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -48,7 +48,6 @@
 #include "exynos_mixer.h"
 
 #include <linux/gpio.h>
-#include <media/s5p_hdmi.h>
 
 #define ctx_from_connector(c)  container_of(c, struct hdmi_context, connector)
 
@@ -2259,30 +2258,6 @@ fail:
        return ret;
 }
 
-static struct s5p_hdmi_platform_data *drm_hdmi_dt_parse_pdata
-                                       (struct device *dev)
-{
-       struct device_node *np = dev->of_node;
-       struct s5p_hdmi_platform_data *pd;
-       u32 value;
-
-       pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
-       if (!pd)
-               goto err_data;
-
-       if (!of_find_property(np, "hpd-gpio", &value)) {
-               DRM_ERROR("no hpd gpio property found\n");
-               goto err_data;
-       }
-
-       pd->hpd_gpio = of_get_named_gpio(np, "hpd-gpio", 0);
-
-       return pd;
-
-err_data:
-       return NULL;
-}
-
 static struct of_device_id hdmi_match_types[] = {
        {
                .compatible = "samsung,exynos5-hdmi",
@@ -2343,7 +2318,6 @@ static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
 static int hdmi_probe(struct platform_device *pdev)
 {
        struct device_node *ddc_node, *phy_node;
-       struct s5p_hdmi_platform_data *pdata;
        struct hdmi_driver_data *drv_data;
        const struct of_device_id *match;
        struct device *dev = &pdev->dev;
@@ -2354,10 +2328,6 @@ static int hdmi_probe(struct platform_device *pdev)
        if (!dev->of_node)
                return -ENODEV;
 
-       pdata = drm_hdmi_dt_parse_pdata(dev);
-       if (!pdata)
-               return -EINVAL;
-
        hdata = devm_kzalloc(dev, sizeof(struct hdmi_context), GFP_KERNEL);
        if (!hdata)
                return -ENOMEM;
@@ -2378,8 +2348,12 @@ static int hdmi_probe(struct platform_device *pdev)
        hdata->phy_confs = drv_data->phy_confs;
        hdata->phy_conf_count = drv_data->phy_conf_count;
 
-       hdata->hpd_gpio = pdata->hpd_gpio;
        hdata->dev = dev;
+       hdata->hpd_gpio = of_get_named_gpio(dev->of_node, "hpd-gpio", 0);
+       if (hdata->hpd_gpio < 0) {
+               DRM_ERROR("cannot get hpd gpio property\n");
+               return hdata->hpd_gpio;
+       }
 
        ret = hdmi_resources_init(hdata);
        if (ret) {