Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / gma500 / mdfld_dsi_output.c

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 6e91b20ce2e500fd766103ce1d11403a4257f383..abf2248da61ecffec15d80fc0d07f0137f7418c0 100644 (file)
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -318,7 +318,7 @@ static void mdfld_dsi_connector_destroy(struct drm_connector *connector)
 
        if (!dsi_connector)
                return;
-       drm_sysfs_connector_remove(connector);
+       drm_connector_unregister(connector);
        drm_connector_cleanup(connector);
        sender = dsi_connector->pkg_sender;
        mdfld_dsi_pkg_sender_destroy(sender);
@@ -597,7 +597,7 @@ void mdfld_dsi_output_init(struct drm_device *dev,
        dsi_config->encoder = encoder;
        encoder->base.type = (pipe == 0) ? INTEL_OUTPUT_MIPI :
                INTEL_OUTPUT_MIPI2;
-       drm_sysfs_connector_add(connector);
+       drm_connector_register(connector);
        return;
 
        /*TODO: add code to destroy outputs on error*/