Skip to content

Commit

Permalink
drm/sun4i: Remove open-coded drm_connector_register_all()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Jun 22, 2016
1 parent 398e979 commit 366e292
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions drivers/gpu/drm/sun4i/sun4i_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,6 @@
#include "sun4i_layer.h"
#include "sun4i_tcon.h"

static int sun4i_drv_connector_plug_all(struct drm_device *drm)
{
struct drm_connector *connector, *failed;
int ret;

mutex_lock(&drm->mode_config.mutex);
list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
ret = drm_connector_register(connector);
if (ret) {
failed = connector;
goto err;
}
}
mutex_unlock(&drm->mode_config.mutex);
return 0;

err:
list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
if (failed == connector)
break;

drm_connector_unregister(connector);
}
mutex_unlock(&drm->mode_config.mutex);

return ret;
}

static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe)
{
struct sun4i_drv *drv = drm->dev_private;
Expand Down Expand Up @@ -183,14 +155,8 @@ static int sun4i_drv_bind(struct device *dev)
if (ret)
goto free_drm;

ret = sun4i_drv_connector_plug_all(drm);
if (ret)
goto unregister_drm;

return 0;

unregister_drm:
drm_dev_unregister(drm);
free_drm:
drm_dev_unref(drm);
return ret;
Expand Down

0 comments on commit 366e292

Please sign in to comment.