* [PATCH] drm/amd/amdgpu: remove useless break after return
@ 2021-11-15 7:14 Bernard Zhao
2021-11-15 7:31 ` Joe Perches
2021-11-17 21:25 ` Alex Deucher
0 siblings, 2 replies; 3+ messages in thread
From: Bernard Zhao @ 2021-11-15 7:14 UTC (permalink / raw)
To: Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter, Thomas Zimmermann, Evan Quan, Sakari Ailus,
Lee Jones, Bernard Zhao, amd-gfx, dri-devel, linux-kernel
This change is to remove useless break after return.
Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index b200b9e722d9..8318ee8339f1 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2092,22 +2092,18 @@ static int dce_v8_0_pick_dig_encoder(struct drm_encoder *encoder)
return 1;
else
return 0;
- break;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
if (dig->linkb)
return 3;
else
return 2;
- break;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
if (dig->linkb)
return 5;
else
return 4;
- break;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
return 6;
- break;
default:
DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
return 0;
--
2.33.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amd/amdgpu: remove useless break after return
2021-11-15 7:14 [PATCH] drm/amd/amdgpu: remove useless break after return Bernard Zhao
@ 2021-11-15 7:31 ` Joe Perches
2021-11-17 21:25 ` Alex Deucher
1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2021-11-15 7:31 UTC (permalink / raw)
To: Bernard Zhao, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter, Thomas Zimmermann, Evan Quan,
Sakari Ailus, Lee Jones, amd-gfx, dri-devel, linux-kernel
On Sun, 2021-11-14 at 23:14 -0800, Bernard Zhao wrote:
> This change is to remove useless break after return.
[]
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
[]
> @@ -2092,22 +2092,18 @@ static int dce_v8_0_pick_dig_encoder(struct drm_encoder *encoder)
> return 1;
> else
> return 0;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
> if (dig->linkb)
> return 3;
> else
> return 2;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
> if (dig->linkb)
> return 5;
> else
> return 4;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
> return 6;
> - break;
> default:
> DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
> return 0;
Perhaps rewrite to make the sequential numbering more obvious.
---
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index b200b9e722d97..7307524b706b4 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2088,26 +2088,13 @@ static int dce_v8_0_pick_dig_encoder(struct drm_encoder *encoder)
switch (amdgpu_encoder->encoder_id) {
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
- if (dig->linkb)
- return 1;
- else
- return 0;
- break;
+ return !dig->linkb ? 0 : 1;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
- if (dig->linkb)
- return 3;
- else
- return 2;
- break;
+ return !dig->linkb ? 2 : 3;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
- if (dig->linkb)
- return 5;
- else
- return 4;
- break;
+ return !dig->linkb ? 4 : 5;
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
return 6;
- break;
default:
DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
return 0;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amd/amdgpu: remove useless break after return
2021-11-15 7:14 [PATCH] drm/amd/amdgpu: remove useless break after return Bernard Zhao
2021-11-15 7:31 ` Joe Perches
@ 2021-11-17 21:25 ` Alex Deucher
1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2021-11-17 21:25 UTC (permalink / raw)
To: Bernard Zhao
Cc: Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter, Thomas Zimmermann, Evan Quan, Sakari Ailus,
Lee Jones, amd-gfx list, Maling list - DRI developers, LKML
Applied thanks. If you want to make the numbering more sequential,
please also update the other dce files if you make that change.
Alex
On Mon, Nov 15, 2021 at 2:14 AM Bernard Zhao <bernard@vivo.com> wrote:
>
> This change is to remove useless break after return.
>
> Signed-off-by: Bernard Zhao <bernard@vivo.com>
> ---
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index b200b9e722d9..8318ee8339f1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -2092,22 +2092,18 @@ static int dce_v8_0_pick_dig_encoder(struct drm_encoder *encoder)
> return 1;
> else
> return 0;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
> if (dig->linkb)
> return 3;
> else
> return 2;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
> if (dig->linkb)
> return 5;
> else
> return 4;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
> return 6;
> - break;
> default:
> DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
> return 0;
> --
> 2.33.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-17 21:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-15 7:14 [PATCH] drm/amd/amdgpu: remove useless break after return Bernard Zhao
2021-11-15 7:31 ` Joe Perches
2021-11-17 21:25 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®