drm/bridge: Drop drm_connector_unregister and call drm_connector_cleanup directly
Drop unneeded drm_connector_unregister() and remove the unnecessary wrapper functions around drm_connector_cleanup(). Signed-off-by: Marek Vasut <marex@denx.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161005143133.5549-1-marex@denx.de
This commit is contained in:
parent
21bf75eca0
commit
fdd8326a01
@ -999,18 +999,11 @@ analogix_dp_detect(struct drm_connector *connector, bool force)
|
|||||||
return status;
|
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 = {
|
static const struct drm_connector_funcs analogix_dp_connector_funcs = {
|
||||||
.dpms = drm_atomic_helper_connector_dpms,
|
.dpms = drm_atomic_helper_connector_dpms,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.detect = analogix_dp_detect,
|
.detect = analogix_dp_detect,
|
||||||
.destroy = analogix_dp_connector_destroy,
|
.destroy = drm_connector_cleanup,
|
||||||
.reset = drm_atomic_helper_connector_reset,
|
.reset = drm_atomic_helper_connector_reset,
|
||||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
|
@ -1477,12 +1477,6 @@ dw_hdmi_connector_mode_valid(struct drm_connector *connector,
|
|||||||
return mode_status;
|
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)
|
static void dw_hdmi_connector_force(struct drm_connector *connector)
|
||||||
{
|
{
|
||||||
struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
|
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,
|
.dpms = drm_atomic_helper_connector_dpms,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.detect = dw_hdmi_connector_detect,
|
.detect = dw_hdmi_connector_detect,
|
||||||
.destroy = dw_hdmi_connector_destroy,
|
.destroy = drm_connector_cleanup,
|
||||||
.force = dw_hdmi_connector_force,
|
.force = dw_hdmi_connector_force,
|
||||||
.reset = drm_atomic_helper_connector_reset,
|
.reset = drm_atomic_helper_connector_reset,
|
||||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||||
|
@ -1165,17 +1165,11 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = {
|
|||||||
.best_encoder = tc_connector_best_encoder,
|
.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 = {
|
static const struct drm_connector_funcs tc_connector_funcs = {
|
||||||
.dpms = drm_atomic_helper_connector_dpms,
|
.dpms = drm_atomic_helper_connector_dpms,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.detect = tc_connector_detect,
|
.detect = tc_connector_detect,
|
||||||
.destroy = tc_connector_destroy,
|
.destroy = drm_connector_cleanup,
|
||||||
.reset = drm_atomic_helper_connector_reset,
|
.reset = drm_atomic_helper_connector_reset,
|
||||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
|
Loading…
Reference in New Issue
Block a user