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(). Reviewed-by: Thomas Zimmermann <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 19 +------------------ include/drm/drm_atomic_state_helper.h | 2 -- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index cfb54fc853ef..fbdc3d893a0c 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -871,12 +871,11 @@ EXPORT_SYMBOL(drm_atomic_helper_bridge_duplicate_state); * drm_atomic_helper_bridge_destroy_state() - Destroy a bridge state object * @bridge: the bridge this state refers to * @state: bridge state to destroy * * Destroys a bridge state previously created by - * &drm_atomic_helper_bridge_create_state(), - * &drm_atomic_helper_bridge_reset() or + * &drm_atomic_helper_bridge_create_state() or * &drm_atomic_helper_bridge_duplicate_state(). This helper is meant to be * used as a bridge &drm_bridge_funcs.atomic_destroy_state hook for bridges * that don't subclass the bridge state. */ void drm_atomic_helper_bridge_destroy_state(struct drm_bridge *bridge, @@ -905,26 +904,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) -{ - return drm_atomic_helper_bridge_create_state(bridge); -} -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 * 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
