1 files changed, 13 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 3fd082933c87..bfcefbf33709 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -658,7 +658,7 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
 };
 
-bool intel_dsi_init(struct drm_device *dev)
+void intel_dsi_init(struct drm_device *dev)
 {
         struct intel_dsi *intel_dsi;
         struct intel_encoder *intel_encoder;
@@ -674,29 +674,29 @@ bool intel_dsi_init(struct drm_device *dev)
 
         /* There is no detection method for MIPI so rely on VBT */
         if (!dev_priv->vbt.has_mipi)
-                return false;
+                return;
+
+        if (IS_VALLEYVIEW(dev)) {
+                dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
+        } else {
+                DRM_ERROR("Unsupported Mipi device to reg base");
+                return;
+        }
 
         intel_dsi = kzalloc(sizeof(*intel_dsi), GFP_KERNEL);
         if (!intel_dsi)
-                return false;
+                return;
 
         intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL);
         if (!intel_connector) {
                 kfree(intel_dsi);
-                return false;
+                return;
         }
 
         intel_encoder = &intel_dsi->base;
         encoder = &intel_encoder->base;
         intel_dsi->attached_connector = intel_connector;
 
-        if (IS_VALLEYVIEW(dev)) {
-                dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
-        } else {
-                DRM_ERROR("Unsupported Mipi device to reg base");
-                return false;
-        }
-
         connector = &intel_connector->base;
 
         drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI);
@@ -743,7 +743,7 @@ bool intel_dsi_init(struct drm_device *dev)
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         fixed_mode = dsi->dev_ops->get_modes(&intel_dsi->dev);
         if (!fixed_mode) {
@@ -754,12 +754,10 @@ bool intel_dsi_init(struct drm_device *dev)
         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
         intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 
-        return true;
+        return;
 
 err:
         drm_encoder_cleanup(&intel_encoder->base);
         kfree(intel_dsi);
         kfree(intel_connector);
-
-        return false;
 }