diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-21 05:28:03 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-22 03:57:45 -0400 |
commit | 366e292df678caed1fb3644989e6b5ae2333808c (patch) | |
tree | 86e08c2650d5e5a4b1e1fdfd716d7b9674ebd1ac | |
parent | 398e97994f6d2d7165a4aa53c1a0903a2a7d3111 (diff) |
drm/sun4i: Remove open-coded drm_connector_register_all()
drm_dev_register() will now register all known connectors, so we no
longer have to do so manually.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466501283-19976-4-git-send-email-chris@chris-wilson.co.uk
-rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_drv.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 5c4b4ad17ad3..9a67f927a53e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c | |||
@@ -24,34 +24,6 @@ | |||
24 | #include "sun4i_layer.h" | 24 | #include "sun4i_layer.h" |
25 | #include "sun4i_tcon.h" | 25 | #include "sun4i_tcon.h" |
26 | 26 | ||
27 | static int sun4i_drv_connector_plug_all(struct drm_device *drm) | ||
28 | { | ||
29 | struct drm_connector *connector, *failed; | ||
30 | int ret; | ||
31 | |||
32 | mutex_lock(&drm->mode_config.mutex); | ||
33 | list_for_each_entry(connector, &drm->mode_config.connector_list, head) { | ||
34 | ret = drm_connector_register(connector); | ||
35 | if (ret) { | ||
36 | failed = connector; | ||
37 | goto err; | ||
38 | } | ||
39 | } | ||
40 | mutex_unlock(&drm->mode_config.mutex); | ||
41 | return 0; | ||
42 | |||
43 | err: | ||
44 | list_for_each_entry(connector, &drm->mode_config.connector_list, head) { | ||
45 | if (failed == connector) | ||
46 | break; | ||
47 | |||
48 | drm_connector_unregister(connector); | ||
49 | } | ||
50 | mutex_unlock(&drm->mode_config.mutex); | ||
51 | |||
52 | return ret; | ||
53 | } | ||
54 | |||
55 | static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe) | 27 | static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe) |
56 | { | 28 | { |
57 | struct sun4i_drv *drv = drm->dev_private; | 29 | struct sun4i_drv *drv = drm->dev_private; |
@@ -183,14 +155,8 @@ static int sun4i_drv_bind(struct device *dev) | |||
183 | if (ret) | 155 | if (ret) |
184 | goto free_drm; | 156 | goto free_drm; |
185 | 157 | ||
186 | ret = sun4i_drv_connector_plug_all(drm); | ||
187 | if (ret) | ||
188 | goto unregister_drm; | ||
189 | |||
190 | return 0; | 158 | return 0; |
191 | 159 | ||
192 | unregister_drm: | ||
193 | drm_dev_unregister(drm); | ||
194 | free_drm: | 160 | free_drm: |
195 | drm_dev_unref(drm); | 161 | drm_dev_unref(drm); |
196 | return ret; | 162 | return ret; |