From 82c702cb0c041a9a1c69f489d1517235a633fc77 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 30 Jul 2018 11:53:06 +0100 Subject: drm/armada: remove unnecessary armada_plane structure We no longer require a private armada_plane structure, so eliminate it, and use the drm_plane structure directly. Signed-off-by: Russell King --- drivers/gpu/drm/armada/armada_plane.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'drivers/gpu/drm/armada/armada_plane.c') diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c index bed2dca83a37..9f36423dd394 100644 --- a/drivers/gpu/drm/armada/armada_plane.c +++ b/drivers/gpu/drm/armada/armada_plane.c @@ -271,25 +271,14 @@ static const struct drm_plane_funcs armada_primary_plane_funcs = { .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, }; -int armada_drm_plane_init(struct armada_plane *plane) -{ - init_waitqueue_head(&plane->frame_wait); - return 0; -} - int armada_drm_primary_plane_init(struct drm_device *drm, - struct armada_plane *primary) + struct drm_plane *primary) { int ret; - ret = armada_drm_plane_init(primary); - if (ret) - return ret; - - drm_plane_helper_add(&primary->base, - &armada_primary_plane_helper_funcs); + drm_plane_helper_add(primary, &armada_primary_plane_helper_funcs); - ret = drm_universal_plane_init(drm, &primary->base, 0, + ret = drm_universal_plane_init(drm, primary, 0, &armada_primary_plane_funcs, armada_primary_formats, ARRAY_SIZE(armada_primary_formats), -- cgit v1.2.3