Work is in progress for every drm_panel to embed a drm_bridge, and for that a function will be needed in the drm_panel API to tell whether a bridge represents a panel or something else. The ideal name for that will be drm_bridge_is_panel(), which however is already in use by the panel_bridge.
Rename the current function in the panel_bridge API to drm_bridge_is_panel_bridge(), which is more precise and frees up the drm_bridge_is_panel() for future use in the drm_panel API. No functional changes, just renaming a function treewide. Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/bridge/panel.c | 8 ++++---- drivers/gpu/drm/display/drm_bridge_connector.c | 2 +- include/drm/drm_bridge.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 40e3970e8b76..0582c708957c 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -221,17 +221,17 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { }; /** - * drm_bridge_is_panel - Checks if a drm_bridge is a panel_bridge. + * drm_bridge_is_panel_bridge - Checks if a drm_bridge is a panel_bridge. * * @bridge: The drm_bridge to be checked. * * Returns true if the bridge is a panel bridge, or false otherwise. */ -bool drm_bridge_is_panel(const struct drm_bridge *bridge) +bool drm_bridge_is_panel_bridge(const struct drm_bridge *bridge) { return bridge->funcs == &panel_bridge_bridge_funcs; } -EXPORT_SYMBOL(drm_bridge_is_panel); +EXPORT_SYMBOL(drm_bridge_is_panel_bridge); /** * drm_panel_bridge_add - Creates a &drm_bridge and &drm_connector that @@ -321,7 +321,7 @@ void drm_panel_bridge_remove(struct drm_bridge *bridge) if (!bridge) return; - if (!drm_bridge_is_panel(bridge)) { + if (!drm_bridge_is_panel_bridge(bridge)) { drm_warn(bridge->dev, "%s: called on non-panel bridge!\n", __func__); return; } diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 00feb73e63d7..5de9b76f345b 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -983,7 +983,7 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (bridge->ddc) ddc = bridge->ddc; - if (drm_bridge_is_panel(bridge)) { + if (drm_bridge_is_panel_bridge(bridge)) { drm_bridge_put(panel_bridge); panel_bridge = drm_bridge_get(bridge); } diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 9f2294957669..b29096d624d5 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -1474,7 +1474,7 @@ void drm_bridge_hpd_notify(struct drm_bridge *bridge, enum drm_connector_status status); #if IS_ENABLED(CONFIG_DRM_PANEL_BRIDGE) -bool drm_bridge_is_panel(const struct drm_bridge *bridge); +bool drm_bridge_is_panel_bridge(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); @@ -1490,7 +1490,7 @@ 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); #else -static inline bool drm_bridge_is_panel(const struct drm_bridge *bridge) +static inline bool drm_bridge_is_panel_bridge(const struct drm_bridge *bridge) { return false; } -- 2.55.0
