drm/omap: Determine connector type directly in omap_connector.c

Instead of determining the connector type from the type of the display's
omap_dss_device and passing it to the omap_connector_init() function,
move the type determination code to omap_connector.c and remove the type
argument to the connector init function. This moves code to a more
natural location, making the driver easier to read.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 2 insertions, 25 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 03771f818eaa..5f98506ac2c5 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -129,28 +129,6 @@ static const struct drm_mode_config_funcs omap_mode_config_funcs = {
         .atomic_commit = drm_atomic_helper_commit,
 };
 
-static int get_connector_type(struct omap_dss_device *display)
-{
-        switch (display->type) {
-        case OMAP_DISPLAY_TYPE_HDMI:
-                return DRM_MODE_CONNECTOR_HDMIA;
-        case OMAP_DISPLAY_TYPE_DVI:
-                return DRM_MODE_CONNECTOR_DVID;
-        case OMAP_DISPLAY_TYPE_DSI:
-                return DRM_MODE_CONNECTOR_DSI;
-        case OMAP_DISPLAY_TYPE_DPI:
-        case OMAP_DISPLAY_TYPE_DBI:
-                return DRM_MODE_CONNECTOR_DPI;
-        case OMAP_DISPLAY_TYPE_VENC:
-                /* TODO: This could also be composite */
-                return DRM_MODE_CONNECTOR_SVIDEO;
-        case OMAP_DISPLAY_TYPE_SDI:
-                return DRM_MODE_CONNECTOR_LVDS;
-        default:
-                return DRM_MODE_CONNECTOR_Unknown;
-        }
-}
-
 static void omap_disconnect_pipelines(struct drm_device *ddev)
 {
         struct omap_drm_private *priv = ddev->dev_private;
@@ -322,9 +300,8 @@ static int omap_modeset_init(struct drm_device *dev)
                 if (!encoder)
                         return -ENOMEM;
 
-                connector = omap_connector_init(dev,
-                                get_connector_type(display), pipe->output,
-                                display, encoder);
+                connector = omap_connector_init(dev, pipe->output, display,
+                                                encoder);
                 if (!connector)
                         return -ENOMEM;