The deprecated devm_drm_put_bridge() function is not used anymore. Signed-off-by: Luca Ceresoli <[email protected]> --- Documentation/gpu/todo.rst | 16 ---------------- drivers/gpu/drm/drm_bridge.c | 17 ----------------- include/drm/drm_bridge.h | 2 -- 3 files changed, 35 deletions(-)
diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index b7351467dc74..cb0ce432c114 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -484,22 +484,6 @@ Contact: Douglas Anderson <[email protected]> Level: Starter -Remove devm_drm_put_bridge() ----------------------------- - -Due to how the panel bridge handles the drm_bridge object lifetime, special -care must be taken to dispose of the drm_bridge object when the -panel_bridge is removed. This is currently managed using -devm_drm_put_bridge(), but that is an unsafe, temporary workaround. To fix -that, the DRM panel lifetime needs to be reworked. After the rework is -done, remove devm_drm_put_bridge() and the TODO in -drm_panel_bridge_remove(). - -Contact: Maxime Ripard <[email protected]>, - Luca Ceresoli <[email protected]> - -Level: Intermediate - Convert users of of_drm_find_bridge() to of_drm_find_and_get_bridge() --------------------------------------------------------------------- diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 649f6b6ab5c8..632dccd79e91 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -1737,23 +1737,6 @@ struct drm_bridge *of_drm_get_bridge_by_endpoint(const struct device_node *np, EXPORT_SYMBOL_GPL(of_drm_get_bridge_by_endpoint); #endif -/** - * devm_drm_put_bridge - Release a bridge reference obtained via devm - * @dev: device that got the bridge via devm - * @bridge: pointer to a struct drm_bridge obtained via devm - * - * Same as drm_bridge_put() for bridge pointers obtained via devm functions - * such as devm_drm_bridge_alloc(). - * - * This function is a temporary workaround and MUST NOT be used. Manual - * handling of bridge lifetime is inherently unsafe. - */ -void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge) -{ - devm_release_action(dev, drm_bridge_put_void, bridge); -} -EXPORT_SYMBOL(devm_drm_put_bridge); - static void drm_bridge_debugfs_show_bridge(struct drm_printer *p, struct drm_bridge *bridge, unsigned int idx, diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 11c203391de5..9a688b20bc1e 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -1473,8 +1473,6 @@ void drm_bridge_hpd_disable(struct drm_bridge *bridge); void drm_bridge_hpd_notify(struct drm_bridge *bridge, enum drm_connector_status status); -void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge); - void drm_bridge_debugfs_params(struct dentry *root); void drm_bridge_debugfs_encoder_params(struct dentry *root, struct drm_encoder *encoder); -- 2.55.0
