Commit 2709935b authored Jun 25, 2022 by Dmitry Baryshkov

drm/msm/dpu: simplify and unify dpu_encoder_get_intf and dpu_encoder_get_wb

Remove extra nestting level from the dpu_encoder_get_intf(), replacing it
with the explicit return in case the INTF_WB was passed to the function.

While we are at it, also change dpu_encoder_get_wb() to also use
explicit return rather than the goto.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/491189/
Link: https://lore.kernel.org/r/20220625003028.383259-1-dmitry.baryshkov@linaro.org

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

parent b1665047

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -1255,14 +1255,15 @@ static enum dpu_intf dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog,
		{
		int i = 0;

		if (type != INTF_WB) {
		if (type == INTF_WB)
		return INTF_MAX;

		for (i = 0; i < catalog->intf_count; i++) {
		if (catalog->intf[i].type == type
		&& catalog->intf[i].controller_id == controller_id) {
		return catalog->intf[i].id;
		}
		}
		}

		return INTF_MAX;
		}
		@@ -1273,14 +1274,13 @@ static enum dpu_wb dpu_encoder_get_wb(const struct dpu_mdss_cfg *catalog,
		int i = 0;

		if (type != INTF_WB)
		goto end;
		return WB_MAX;

		for (i = 0; i < catalog->wb_count; i++) {
		if (catalog->wb[i].id == controller_id)
		return catalog->wb[i].id;
		}

		end:
		return WB_MAX;
		}