Merge branch 'drm-tda998x-mali' into drm-tda998x-devel

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / i2c / tda998x_drv.c

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 9798d400d8174750522b1704be66364fe9425318..088900d78ceb5c2946705c4252d3f5ec296a01ce 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1584,7 +1584,6 @@ const struct drm_connector_helper_funcs tda998x_connector_helper_funcs = {
 
 static void tda998x_connector_destroy(struct drm_connector *connector)
 {
-       drm_connector_unregister(connector);
        drm_connector_cleanup(connector);
 }
 
@@ -1656,16 +1655,10 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data)
        if (ret)
                goto err_connector;
 
-       ret = drm_connector_register(&priv->connector);
-       if (ret)
-               goto err_sysfs;
-
        drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
 
        return 0;
 
-err_sysfs:
-       drm_connector_cleanup(&priv->connector);
 err_connector:
        drm_encoder_cleanup(&priv->encoder);
 err_encoder:
@@ -1678,7 +1671,6 @@ static void tda998x_unbind(struct device *dev, struct device *master,
 {
        struct tda998x_priv *priv = dev_get_drvdata(dev);
 
-       drm_connector_unregister(&priv->connector);
        drm_connector_cleanup(&priv->connector);
        drm_encoder_cleanup(&priv->encoder);
        tda998x_destroy(priv);