@@ -1217,7 +1217,7 @@ EXPORT_SYMBOL_GPL(drm_bridge_get_modes);
1217
1217
* the EDID and return it. Otherwise return NULL.
1218
1218
*
1219
1219
* 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.
1221
1221
*
1222
1222
* RETURNS:
1223
1223
* The retrieved EDID on success, or NULL otherwise.
@@ -1233,7 +1233,7 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,
1233
1233
const struct drm_edid * drm_edid ;
1234
1234
struct edid * edid ;
1235
1235
1236
- edid = drm_bridge_get_edid (bridge , connector );
1236
+ edid = bridge -> funcs -> get_edid (bridge , connector );
1237
1237
if (!edid )
1238
1238
return NULL ;
1239
1239
@@ -1248,30 +1248,6 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,
1248
1248
}
1249
1249
EXPORT_SYMBOL_GPL (drm_bridge_edid_read );
1250
1250
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
-
1275
1251
/**
1276
1252
* drm_bridge_hpd_enable - enable hot plug detection for the bridge
1277
1253
* @bridge: bridge control structure
0 commit comments