drm: rcar-du: Remove platform data support

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / gpu / drm / rcar-du / rcar_du_lvdscon.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index ac84f4d..381d0a7 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -27,7 +27,11 @@
 struct rcar_du_lvds_connector {
        struct rcar_du_connector connector;
 
-       struct rcar_du_panel_data panel;
+       struct {
+               unsigned int width_mm;          /* Panel width in mm */
+               unsigned int height_mm;         /* Panel height in mm */
+               struct videomode mode;
+       } panel;
 };
 
 #define to_rcar_lvds_connector(c) \
@@ -85,31 +89,25 @@ static const struct drm_connector_funcs connector_funcs = {
 
 int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
                                struct rcar_du_encoder *renc,
-                               const struct rcar_du_panel_data *panel,
                                /* TODO const */ struct device_node *np)
 {
        struct rcar_du_lvds_connector *lvdscon;
        struct drm_connector *connector;
+       struct display_timing timing;
        int ret;
 
        lvdscon = devm_kzalloc(rcdu->dev, sizeof(*lvdscon), GFP_KERNEL);
        if (lvdscon == NULL)
                return -ENOMEM;
 
-       if (panel) {
-               lvdscon->panel = *panel;
-       } else {
-               struct display_timing timing;
-
-               ret = of_get_display_timing(np, "panel-timing", &timing);
-               if (ret < 0)
-                       return ret;
+       ret = of_get_display_timing(np, "panel-timing", &timing);
+       if (ret < 0)
+               return ret;
 
-               videomode_from_timing(&timing, &lvdscon->panel.mode);
+       videomode_from_timing(&timing, &lvdscon->panel.mode);
 
-               of_property_read_u32(np, "width-mm", &lvdscon->panel.width_mm);
-               of_property_read_u32(np, "height-mm", &lvdscon->panel.height_mm);
-       }
+       of_property_read_u32(np, "width-mm", &lvdscon->panel.width_mm);
+       of_property_read_u32(np, "height-mm", &lvdscon->panel.height_mm);
 
        connector = &lvdscon->connector.connector;
        connector->display_info.width_mm = lvdscon->panel.width_mm;