[PATCH v2] drm/msm/dpu: simplify and unify dpu_encoder_get_intf and dpu_encoder_get_wb

[PATCH v2] drm/msm/dpu: simplify and unify dpu_encoder_get_intf and dpu_encoder_get_wb

[Dmitry Baryshkov]

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>
---

Changes since v1: fix the typo (noticed by Stephen)

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index f435baa500f8..c682d4e02d1b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1255,12 +1255,13 @@ static enum dpu_intf dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog,
 {
 	int i = 0;
 
-	if (type != INTF_WB) {
-		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;
-			}
+	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;
 		}
 	}
 
@@ -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;
 }
 
-- 
2.35.1

Re: [PATCH v2] drm/msm/dpu: simplify and unify dpu_encoder_get_intf and dpu_encoder_get_wb

[Abhinav Kumar]

On 6/24/2022 5:30 PM, Dmitry Baryshkov wrote:
> 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>
> ---
> 
> Changes since v1: fix the typo (noticed by Stephen)
> 
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index f435baa500f8..c682d4e02d1b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1255,12 +1255,13 @@ static enum dpu_intf dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog,
>   {
>   	int i = 0;
>   
> -	if (type != INTF_WB) {
> -		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;
> -			}
> +	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;
>   		}
>   	}
>   
> @@ -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;
>   }
>