3 files changed, 31 insertions, 30 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 92fea0085a9c..06c48a64b745 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -325,10 +325,33 @@ static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {
         .mode_valid = omap_connector_mode_valid,
 };
 
+static int omap_connector_get_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;
+        }
+}
+
 /* initialize connector */
 struct drm_connector *omap_connector_init(struct drm_device *dev,
-                int connector_type, struct omap_dss_device *output,
-                struct omap_dss_device *display, struct drm_encoder *encoder)
+                                          struct omap_dss_device *output,
+                                          struct omap_dss_device *display,
+                                          struct drm_encoder *encoder)
 {
         struct drm_connector *connector = NULL;
         struct omap_connector *omap_connector;
@@ -348,7 +371,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
         connector->doublescan_allowed = 0;
 
         drm_connector_init(dev, connector, &omap_connector_funcs,
-                                connector_type);
+                           omap_connector_get_type(display));
         drm_connector_helper_add(connector, &omap_connector_helper_funcs);
 
         /*
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.h b/drivers/gpu/drm/omapdrm/omap_connector.h
index 42ff0a106179..854099801649 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.h
+++ b/drivers/gpu/drm/omapdrm/omap_connector.h
@@ -28,8 +28,9 @@ struct drm_encoder;
 struct omap_dss_device;
 
 struct drm_connector *omap_connector_init(struct drm_device *dev,
-                int connector_type, struct omap_dss_device *output,
-                struct omap_dss_device *display, struct drm_encoder *encoder);
+                                          struct omap_dss_device *output,
+                                          struct omap_dss_device *display,
+                                          struct drm_encoder *encoder);
 struct drm_encoder *omap_connector_attached_encoder(
                 struct drm_connector *connector);
 bool omap_connector_get_hdmi_mode(struct drm_connector *connector);
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;