Skip to content

Commit 3ce7384

Browse files
committed
drm/bridge: remove drm_bridge_get_edid() in favour of drm_bridge_edid_read()
All users of drm_bridge_get_edid() have been converted to use drm_bridge_edid_read(). Remove drm_bridge_get_edid(). Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/c51d50edddbe8816eaa63e6ccafa9f2354b506ba.1706038510.git.jani.nikula@intel.com
1 parent b334be8 commit 3ce7384

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

drivers/gpu/drm/drm_bridge.c

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ EXPORT_SYMBOL_GPL(drm_bridge_get_modes);
12171217
* the EDID and return it. Otherwise return NULL.
12181218
*
12191219
* If &drm_bridge_funcs.edid_read is not set, fall back to using
1220-
* drm_bridge_get_edid() and wrapping it in struct drm_edid.
1220+
* &drm_bridge_funcs.get_edid and wrapping it in struct drm_edid.
12211221
*
12221222
* RETURNS:
12231223
* The retrieved EDID on success, or NULL otherwise.
@@ -1233,7 +1233,7 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,
12331233
const struct drm_edid *drm_edid;
12341234
struct edid *edid;
12351235

1236-
edid = drm_bridge_get_edid(bridge, connector);
1236+
edid = bridge->funcs->get_edid(bridge, connector);
12371237
if (!edid)
12381238
return NULL;
12391239

@@ -1248,30 +1248,6 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,
12481248
}
12491249
EXPORT_SYMBOL_GPL(drm_bridge_edid_read);
12501250

1251-
/**
1252-
* drm_bridge_get_edid - get the EDID data of the connected display
1253-
* @bridge: bridge control structure
1254-
* @connector: the connector to read EDID for
1255-
*
1256-
* If the bridge supports output EDID retrieval, as reported by the
1257-
* DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.get_edid to
1258-
* get the EDID and return it. Otherwise return NULL.
1259-
*
1260-
* Deprecated. Prefer using drm_bridge_edid_read().
1261-
*
1262-
* RETURNS:
1263-
* The retrieved EDID on success, or NULL otherwise.
1264-
*/
1265-
struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,
1266-
struct drm_connector *connector)
1267-
{
1268-
if (!(bridge->ops & DRM_BRIDGE_OP_EDID))
1269-
return NULL;
1270-
1271-
return bridge->funcs->get_edid(bridge, connector);
1272-
}
1273-
EXPORT_SYMBOL_GPL(drm_bridge_get_edid);
1274-
12751251
/**
12761252
* drm_bridge_hpd_enable - enable hot plug detection for the bridge
12771253
* @bridge: bridge control structure

include/drm/drm_bridge.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,6 @@ int drm_bridge_get_modes(struct drm_bridge *bridge,
921921
struct drm_connector *connector);
922922
const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,
923923
struct drm_connector *connector);
924-
struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,
925-
struct drm_connector *connector);
926924
void drm_bridge_hpd_enable(struct drm_bridge *bridge,
927925
void (*cb)(void *data,
928926
enum drm_connector_status status),

0 commit comments

Comments
 (0)