On Wed, Oct 05, 2016 at 04:31:33PM +0200, Marek Vasut wrote: > Drop unneeded drm_connector_unregister() and remove the unnecessary > wrapper functions around drm_connector_cleanup(). > > Signed-off-by: Marek Vasut <marex@xxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> Yeah, since 4.8 the only connectors you need to register/unregister explicitly are hotpluggeable ones like DP mst. Applied to drm-misc, thanks for this neat little cleanup. -Daniel > --- > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +-------- > drivers/gpu/drm/bridge/dw-hdmi.c | 8 +------- > drivers/gpu/drm/bridge/tc358767.c | 8 +------- > 3 files changed, 3 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index 001b075..6e0447f 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -999,18 +999,11 @@ analogix_dp_detect(struct drm_connector *connector, bool force) > return status; > } > > -static void analogix_dp_connector_destroy(struct drm_connector *connector) > -{ > - drm_connector_unregister(connector); > - drm_connector_cleanup(connector); > - > -} > - > static const struct drm_connector_funcs analogix_dp_connector_funcs = { > .dpms = drm_atomic_helper_connector_dpms, > .fill_modes = drm_helper_probe_single_connector_modes, > .detect = analogix_dp_detect, > - .destroy = analogix_dp_connector_destroy, > + .destroy = drm_connector_cleanup, > .reset = drm_atomic_helper_connector_reset, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c > index 66ad8e6..ab7023e 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1477,12 +1477,6 @@ dw_hdmi_connector_mode_valid(struct drm_connector *connector, > return mode_status; > } > > -static void dw_hdmi_connector_destroy(struct drm_connector *connector) > -{ > - drm_connector_unregister(connector); > - drm_connector_cleanup(connector); > -} > - > static void dw_hdmi_connector_force(struct drm_connector *connector) > { > struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, > @@ -1499,7 +1493,7 @@ static const struct drm_connector_funcs dw_hdmi_connector_funcs = { > .dpms = drm_atomic_helper_connector_dpms, > .fill_modes = drm_helper_probe_single_connector_modes, > .detect = dw_hdmi_connector_detect, > - .destroy = dw_hdmi_connector_destroy, > + .destroy = drm_connector_cleanup, > .force = dw_hdmi_connector_force, > .reset = drm_atomic_helper_connector_reset, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > index a09825d..44d476e 100644 > --- a/drivers/gpu/drm/bridge/tc358767.c > +++ b/drivers/gpu/drm/bridge/tc358767.c > @@ -1165,17 +1165,11 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = { > .best_encoder = tc_connector_best_encoder, > }; > > -static void tc_connector_destroy(struct drm_connector *connector) > -{ > - drm_connector_unregister(connector); > - drm_connector_cleanup(connector); > -} > - > static const struct drm_connector_funcs tc_connector_funcs = { > .dpms = drm_atomic_helper_connector_dpms, > .fill_modes = drm_helper_probe_single_connector_modes, > .detect = tc_connector_detect, > - .destroy = tc_connector_destroy, > + .destroy = drm_connector_cleanup, > .reset = drm_atomic_helper_connector_reset, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > -- > 2.9.3 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel