Skip to content

Commit cce81ba

Browse files
bpankajlLyude
authored andcommitted
drm: Remove drm dp mst destroy_connector callbacks
drm_dp_mst_topology_mgr_cbs.destroy_connector callbacks are identical amongst every driver and don't do anything other than cleaning up the connector((drm_connector_unregister()/drm_connector_put())) except for amdgpu_dm driver where some amdgpu_dm specific code in there. This connector cleaning up is now being handled in the drm core so driver destroy_connector callbacks are not needed (except for amdgpu_dm) hence remove them. Removal is done with below sementic patch: @r1@ identifier func, E; @@ struct drm_dp_mst_topology_cbs E = { ..., - .destroy_connector = func }; @delete depends on r1@ identifier r1.func; @@ - static void func(...){...} Signed-off-by: Pankaj Bharadiya <[email protected]> Suggested-by: Emil Velikov <[email protected]> Suggested-by: Lyude Paul <[email protected]> Signed-off-by: Lyude Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Lyude Paul <[email protected]>
1 parent e1ae63b commit cce81ba

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

drivers/gpu/drm/i915/display/intel_dp_mst.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -719,18 +719,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
719719
return NULL;
720720
}
721721

722-
static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
723-
struct drm_connector *connector)
724-
{
725-
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, connector->name);
726-
drm_connector_unregister(connector);
727-
728-
drm_connector_put(connector);
729-
}
730-
731722
static const struct drm_dp_mst_topology_cbs mst_cbs = {
732723
.add_connector = intel_dp_add_mst_connector,
733-
.destroy_connector = intel_dp_destroy_mst_connector,
734724
};
735725

736726
static struct intel_dp_mst_encoder *

drivers/gpu/drm/nouveau/dispnv50/disp.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,17 +1256,6 @@ nv50_mstm_prepare(struct nv50_mstm *mstm)
12561256
}
12571257
}
12581258

1259-
static void
1260-
nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
1261-
struct drm_connector *connector)
1262-
{
1263-
struct nv50_mstc *mstc = nv50_mstc(connector);
1264-
1265-
drm_connector_unregister(&mstc->connector);
1266-
1267-
drm_connector_put(&mstc->connector);
1268-
}
1269-
12701259
static struct drm_connector *
12711260
nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
12721261
struct drm_dp_mst_port *port, const char *path)
@@ -1285,7 +1274,6 @@ nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
12851274
static const struct drm_dp_mst_topology_cbs
12861275
nv50_mstm = {
12871276
.add_connector = nv50_mstm_add_connector,
1288-
.destroy_connector = nv50_mstm_destroy_connector,
12891277
};
12901278

12911279
void

drivers/gpu/drm/radeon/radeon_dp_mst.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,8 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
301301
return connector;
302302
}
303303

304-
static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
305-
struct drm_connector *connector)
306-
{
307-
drm_connector_unregister(connector);
308-
drm_connector_cleanup(connector);
309-
310-
kfree(connector);
311-
DRM_DEBUG_KMS("\n");
312-
}
313-
314304
static const struct drm_dp_mst_topology_cbs mst_cbs = {
315305
.add_connector = radeon_dp_add_mst_connector,
316-
.destroy_connector = radeon_dp_destroy_mst_connector,
317306
};
318307

319308
static struct

0 commit comments

Comments
 (0)