The connector type argument of drm_panel_bridge_add_typed() and
devm_drm_panel_bridge_add_typed() has been ignored since commit
b7797081ccfe ("drm/panel: embed a drm_bridge into every drm_panel"),
and they have no users left.Assisted-by: LLM Signed-off-by: Dmitry Baryshkov <[email protected]> --- Documentation/gpu/todo.rst | 1 - drivers/gpu/drm/drm_panel.c | 55 ++++----------------------------------------- include/drm/drm_panel.h | 5 ----- 3 files changed, 4 insertions(+), 57 deletions(-) diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index e6d36f8da086..f78455e4c97b 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -475,7 +475,6 @@ not needed anymore. Its APIs are just accessing the embedded drm_bridge transparently, and the are deprecated. The funcions to remove are: - - drm_panel_bridge_add_typed() - devm_drm_of_get_bridge() - drmm_of_get_bridge() - drm_panel_bridge_remove() diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index 268e655140ac..ab701a526ef9 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -270,31 +270,9 @@ struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel) if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) return ERR_PTR(-EINVAL); - return drm_panel_bridge_add_typed(panel, panel->connector_type); -} -EXPORT_SYMBOL(drm_panel_bridge_add); - -/** - * drm_panel_bridge_add_typed - Pretend to create a &drm_bridge and &drm_connector with - * an explicit connector type. - * @panel: The drm_panel being wrapped. Must be non-NULL. - * @connector_type: The connector type (DRM_MODE_CONNECTOR_*) - * - * This is just like drm_panel_bridge_add(), but forces the connector type to - * @connector_type instead of infering it from the panel. - * - * This function is deprecated. A drm_bridge is embedded into every panel. - * Don't use it in new drivers and update your driver to stop using it. - */ -struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, - u32 connector_type) -{ - if (!panel) - return ERR_PTR(-EINVAL); - return drm_bridge_get(&panel->bridge); } -EXPORT_SYMBOL(drm_panel_bridge_add_typed); +EXPORT_SYMBOL(drm_panel_bridge_add); /** * drm_panel_bridge_remove - Unregisters and frees a drm_bridge @@ -362,31 +340,6 @@ static void devm_drm_panel_bridge_release(struct device *dev, void *res) */ struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev, struct drm_panel *panel) -{ - if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) - return ERR_PTR(-EINVAL); - - return devm_drm_panel_bridge_add_typed(dev, panel, - panel->connector_type); -} -EXPORT_SYMBOL(devm_drm_panel_bridge_add); - -/** - * devm_drm_panel_bridge_add_typed - Creates a managed &drm_bridge and - * &drm_connector with an explicit connector type. - * @dev: device to tie the bridge lifetime to - * @panel: The drm_panel being wrapped. Must be non-NULL. - * @connector_type: The connector type (DRM_MODE_CONNECTOR_*) - * - * This is just like devm_drm_panel_bridge_add(), but forces the connector type - * to @connector_type instead of infering it from the panel. - * - * This function is deprecated. A drm_bridge is embedded into every panel. - * Don't use it in new drivers and update your driver to stop using it. - */ -struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev, - struct drm_panel *panel, - u32 connector_type) { struct drm_bridge **ptr, *bridge; @@ -395,7 +348,7 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev, if (!ptr) return ERR_PTR(-ENOMEM); - bridge = drm_panel_bridge_add_typed(panel, connector_type); + bridge = drm_panel_bridge_add(panel); if (IS_ERR(bridge)) { devres_free(ptr); return bridge; @@ -406,7 +359,7 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev, return &panel->bridge; } -EXPORT_SYMBOL(devm_drm_panel_bridge_add_typed); +EXPORT_SYMBOL(devm_drm_panel_bridge_add); static void drmm_drm_panel_bridge_release(struct drm_device *drm, void *ptr) { @@ -436,7 +389,7 @@ struct drm_bridge *drmm_panel_bridge_add(struct drm_device *drm, struct drm_bridge *bridge; int ret; - bridge = drm_panel_bridge_add_typed(panel, panel->connector_type); + bridge = drm_panel_bridge_add(panel); if (IS_ERR(bridge)) return bridge; diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index deae4753a594..07612e9791cd 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -393,16 +393,11 @@ static inline int drm_panel_of_backlight(struct drm_panel *panel) #ifdef CONFIG_DRM_PANEL_BRIDGE bool drm_bridge_is_panel(const struct drm_bridge *bridge); struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel); -struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, - u32 connector_type); void drm_panel_bridge_remove(struct drm_bridge *bridge); int drm_panel_bridge_set_orientation(struct drm_connector *connector, struct drm_bridge *bridge); struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev, struct drm_panel *panel); -struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev, - struct drm_panel *panel, - u32 connector_type); struct drm_bridge *drmm_panel_bridge_add(struct drm_device *drm, struct drm_panel *panel); struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge); -- 2.47.3
