All drivers have been converted to the atomic_create_state callback and its drm_atomic_helper_bridge_create_state() helper.
Remove the deprecated drm_atomic_helper_bridge_reset(). Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 23 ----------------------- include/drm/drm_atomic_state_helper.h | 2 -- 2 files changed, 25 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index b99dedbc4140..29b2667ac792 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -903,33 +903,10 @@ void __drm_atomic_helper_bridge_state_init(struct drm_bridge_state *state, __drm_atomic_helper_private_obj_create_state(&bridge->base, &state->base); state->bridge = bridge; } EXPORT_SYMBOL(__drm_atomic_helper_bridge_state_init); -/** - * drm_atomic_helper_bridge_reset() - Allocate and initialize a bridge state - * to its default - * @bridge: the bridge this state refers to - * - * Allocates the bridge state and initializes it to default values. This helper - * is meant to be used as a bridge &drm_bridge_funcs.atomic_reset hook for - * bridges that don't subclass the bridge state. - */ -struct drm_bridge_state * -drm_atomic_helper_bridge_reset(struct drm_bridge *bridge) -{ - struct drm_bridge_state *bridge_state; - - bridge_state = kzalloc_obj(*bridge_state); - if (!bridge_state) - return ERR_PTR(-ENOMEM); - - __drm_atomic_helper_bridge_state_init(bridge_state, bridge); - return bridge_state; -} -EXPORT_SYMBOL(drm_atomic_helper_bridge_reset); - /** * drm_atomic_helper_bridge_create_state - default &drm_bridge_funcs.atomic_create_state hook for bridges * @bridge: bridge object * * Allocates and initializes pristine @drm_bridge_state. diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 68c685ad330f..34a599c3d86d 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -104,7 +104,5 @@ void drm_atomic_helper_bridge_destroy_state(struct drm_bridge *bridge, struct drm_bridge_state *state); void __drm_atomic_helper_bridge_state_init(struct drm_bridge_state *state, struct drm_bridge *bridge); struct drm_bridge_state * drm_atomic_helper_bridge_create_state(struct drm_bridge *bridge); -struct drm_bridge_state * -drm_atomic_helper_bridge_reset(struct drm_bridge *bridge); -- 2.54.0
