Commit 72dc0f51 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/dp_mst: Remove drm_dp_mst_topology_cbs.destroy_connector 



Now that we've removed the last user of this callback, get rid of it and
drm_dp_destroy_connector().

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200331205740.135525-5-lyude@redhat.com


Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
parent eefc9589

drivers/gpu/drm/drm_dp_mst_topology.c

+3 −13
Original line number Diff line number Diff line
@@ -4690,23 +4690,13 @@ static void drm_dp_tx_work(struct work_struct *work) 
	mutex_unlock(&mgr->qlock);

}



static inline void drm_dp_destroy_connector(struct drm_dp_mst_port *port)

static inline void

drm_dp_delayed_destroy_port(struct drm_dp_mst_port *port)

{

	if (!port->connector)

		return;



	if (port->mgr->cbs->destroy_connector) {

		port->mgr->cbs->destroy_connector(port->mgr, port->connector);

	} else {

	if (port->connector) {

		drm_connector_unregister(port->connector);

		drm_connector_put(port->connector);

	}

}



static inline void

drm_dp_delayed_destroy_port(struct drm_dp_mst_port *port)

{

	drm_dp_destroy_connector(port);



	drm_dp_port_set_pdt(port, DP_PEER_DEVICE_NONE, port->mcs);

	drm_dp_mst_put_port_malloc(port);

include/drm/drm_dp_mst_helper.h

+0 −2
Original line number Diff line number Diff line
@@ -488,8 +488,6 @@ struct drm_dp_mst_topology_mgr; 
struct drm_dp_mst_topology_cbs {

	/* create a connector for a port */

	struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path);

	void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr,

				  struct drm_connector *connector);

};



#define DP_MAX_PAYLOAD (sizeof(unsigned long) * 8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE