__drm_atomic_helper_plane_reset() is no longer used: all callers now go through __drm_atomic_helper_plane_state_init(). Remove it.
Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 22 ---------------------- include/drm/drm_atomic_state_helper.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index f184ce76e090..afd65f0c8f90 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -322,32 +322,10 @@ void __drm_atomic_helper_plane_state_init(struct drm_plane_state *plane_state, plane_state->hotspot_y = val; } } EXPORT_SYMBOL(__drm_atomic_helper_plane_state_init); -/** - * __drm_atomic_helper_plane_reset - reset state on plane - * @plane: drm plane - * @plane_state: plane state to assign - * - * Initializes the newly allocated @plane_state and assigns it to - * the &drm_plane->state pointer of @plane, usually required when - * initializing the drivers or when called from the &drm_plane_funcs.reset - * hook. - * - * This is useful for drivers that subclass the plane state. - */ -void __drm_atomic_helper_plane_reset(struct drm_plane *plane, - struct drm_plane_state *plane_state) -{ - if (plane_state) - __drm_atomic_helper_plane_state_init(plane_state, plane); - - plane->state = plane_state; -} -EXPORT_SYMBOL(__drm_atomic_helper_plane_reset); - /** * drm_atomic_helper_plane_create_state - default &drm_plane_funcs.atomic_create_state hook for planes * @plane: plane object * * Allocates and initializes pristine @drm_plane_state. diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 60635eb34758..9051217833e3 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -57,12 +57,10 @@ void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, void __drm_atomic_helper_plane_state_init(struct drm_plane_state *state, struct drm_plane *plane); struct drm_plane_state * drm_atomic_helper_plane_create_state(struct drm_plane *plane); -void __drm_atomic_helper_plane_reset(struct drm_plane *plane, - struct drm_plane_state *state); void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, struct drm_plane_state *state); struct drm_plane_state * drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane); void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state); -- 2.54.0
