This function returns a struct drm_bridge_connector * because this was the case in the origin of its code. In current code it does not make sense anymore: it can only return either the same pointer it received as input or a negative ERR_PTR.
Simplify up error management by just returning an int (0 or negative error). No functional changes. Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/display/drm_bridge_connector.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index e6306e98a167..6066ca0c5624 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -930,8 +930,7 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_ return 0; } -static struct drm_bridge_connector * -drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_connector) +static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_connector) { int ret; @@ -954,7 +953,7 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con bridge->hdmi_audio_spdif_playback, bridge->hdmi_audio_dai_port); if (ret) - return ERR_PTR(ret); + return ret; } if (bridge_connector->bridge_hdmi_cec && @@ -965,7 +964,7 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con NULL, bridge->hdmi_cec_dev); if (ret) - return ERR_PTR(ret); + return ret; } if (bridge_connector->bridge_hdmi_cec && @@ -978,10 +977,10 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con bridge->hdmi_cec_available_las, bridge->hdmi_cec_dev); if (ret) - return ERR_PTR(ret); + return ret; } - return bridge_connector; + return 0; } /** @@ -1051,9 +1050,9 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector return ERR_PTR(ret); } - bridge_connector = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector); - if (IS_ERR(bridge_connector)) - return bridge_connector; + ret = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector); + if (ret) + return ERR_PTR(ret); drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs); -- 2.54.0
