aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/udl/udl_connector.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/udl/udl_connector.c')
-rw-r--r--drivers/gpu/drm/udl/udl_connector.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index b44d548c56f8..e026a9e2942a 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -105,14 +105,7 @@ static struct drm_encoder*
105udl_best_single_encoder(struct drm_connector *connector) 105udl_best_single_encoder(struct drm_connector *connector)
106{ 106{
107 int enc_id = connector->encoder_ids[0]; 107 int enc_id = connector->encoder_ids[0];
108 struct drm_mode_object *obj; 108 return drm_encoder_find(connector->dev, enc_id);
109 struct drm_encoder *encoder;
110
111 obj = drm_mode_object_find(connector->dev, enc_id, DRM_MODE_OBJECT_ENCODER);
112 if (!obj)
113 return NULL;
114 encoder = obj_to_encoder(obj);
115 return encoder;
116} 109}
117 110
118static int udl_connector_set_property(struct drm_connector *connector, 111static int udl_connector_set_property(struct drm_connector *connector,
@@ -124,7 +117,7 @@ static int udl_connector_set_property(struct drm_connector *connector,
124 117
125static void udl_connector_destroy(struct drm_connector *connector) 118static void udl_connector_destroy(struct drm_connector *connector)
126{ 119{
127 drm_sysfs_connector_remove(connector); 120 drm_connector_unregister(connector);
128 drm_connector_cleanup(connector); 121 drm_connector_cleanup(connector);
129 kfree(connector); 122 kfree(connector);
130} 123}
@@ -154,7 +147,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
154 drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII); 147 drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII);
155 drm_connector_helper_add(connector, &udl_connector_helper_funcs); 148 drm_connector_helper_add(connector, &udl_connector_helper_funcs);
156 149
157 drm_sysfs_connector_add(connector); 150 drm_connector_register(connector);
158 drm_mode_connector_attach_encoder(connector, encoder); 151 drm_mode_connector_attach_encoder(connector, encoder);
159 152
160 drm_object_attach_property(&connector->base, 153 drm_object_attach_property(&connector->base,