* [PATCH] drm/amd/display: Remove else after return in 'dm_vblank_get_counter' & 'amdgpu_dm_backlight_get_level'
@ 2023-07-23 9:31 Srinivasan Shanmugam
2023-07-24 13:55 ` Rodrigo Siqueira
0 siblings, 1 reply; 2+ messages in thread
From: Srinivasan Shanmugam @ 2023-07-23 9:31 UTC (permalink / raw)
To: Aurabindo Pillai, Rodrigo Siqueira; +Cc: Srinivasan Shanmugam, amd-gfx
Expressions under 'else' branch in function 'dm_vblank_get_counter' &
'amdgpu_dm_backlight_get_level' are executed whenever the expression in
'if' is False. Otherwise, return from case occurs. Therefore, there is
no need in 'else', and it has been removed.
Fixes the following:
WARNING: else is not generally useful after a break or return
+ return 0;
+ else {
WARNING: else is not generally useful after a break or return
+ return convert_brightness_to_user(&caps, avg);
+ } else {
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1e1a38014475..77d970a2ee69 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -245,19 +245,20 @@ is_timing_unchanged_for_freesync(struct drm_crtc_state *old_crtc_state,
*/
static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc)
{
+ struct amdgpu_crtc *acrtc = NULL;
+
if (crtc >= adev->mode_info.num_crtc)
return 0;
- else {
- struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc];
- if (acrtc->dm_irq_params.stream == NULL) {
- DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
- crtc);
- return 0;
- }
+ acrtc = adev->mode_info.crtcs[crtc];
- return dc_stream_get_vblank_counter(acrtc->dm_irq_params.stream);
+ if (!acrtc->dm_irq_params.stream) {
+ DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
+ crtc);
+ return 0;
}
+
+ return dc_stream_get_vblank_counter(acrtc->dm_irq_params.stream);
}
static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,
@@ -4091,6 +4092,7 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd)
static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,
int bl_idx)
{
+ int ret;
struct amdgpu_dm_backlight_caps caps;
struct dc_link *link = (struct dc_link *)dm->backlight_link[bl_idx];
@@ -4105,13 +4107,14 @@ static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,
if (!rc)
return dm->brightness[bl_idx];
return convert_brightness_to_user(&caps, avg);
- } else {
- int ret = dc_link_get_backlight_level(link);
-
- if (ret == DC_ERROR_UNEXPECTED)
- return dm->brightness[bl_idx];
- return convert_brightness_to_user(&caps, ret);
}
+
+ ret = dc_link_get_backlight_level(link);
+
+ if (ret == DC_ERROR_UNEXPECTED)
+ return dm->brightness[bl_idx];
+
+ return convert_brightness_to_user(&caps, ret);
}
static int amdgpu_dm_backlight_get_brightness(struct backlight_device *bd)
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/display: Remove else after return in 'dm_vblank_get_counter' & 'amdgpu_dm_backlight_get_level'
2023-07-23 9:31 [PATCH] drm/amd/display: Remove else after return in 'dm_vblank_get_counter' & 'amdgpu_dm_backlight_get_level' Srinivasan Shanmugam
@ 2023-07-24 13:55 ` Rodrigo Siqueira
0 siblings, 0 replies; 2+ messages in thread
From: Rodrigo Siqueira @ 2023-07-24 13:55 UTC (permalink / raw)
To: Srinivasan Shanmugam; +Cc: Aurabindo Pillai, amd-gfx
On 7/23/23 05:31, Srinivasan Shanmugam wrote:
> Expressions under 'else' branch in function 'dm_vblank_get_counter' &
> 'amdgpu_dm_backlight_get_level' are executed whenever the expression in
> 'if' is False. Otherwise, return from case occurs. Therefore, there is
> no need in 'else', and it has been removed.
>
> Fixes the following:
>
> WARNING: else is not generally useful after a break or return
> + return 0;
> + else {
>
> WARNING: else is not generally useful after a break or return
> + return convert_brightness_to_user(&caps, avg);
> + } else {
>
> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
> Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 ++++++++++---------
> 1 file changed, 17 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 1e1a38014475..77d970a2ee69 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -245,19 +245,20 @@ is_timing_unchanged_for_freesync(struct drm_crtc_state *old_crtc_state,
> */
> static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc)
> {
> + struct amdgpu_crtc *acrtc = NULL;
> +
> if (crtc >= adev->mode_info.num_crtc)
> return 0;
> - else {
> - struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc];
>
> - if (acrtc->dm_irq_params.stream == NULL) {
> - DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> - crtc);
> - return 0;
> - }
> + acrtc = adev->mode_info.crtcs[crtc];
>
> - return dc_stream_get_vblank_counter(acrtc->dm_irq_params.stream);
> + if (!acrtc->dm_irq_params.stream) {
> + DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",
> + crtc);
> + return 0;
> }
> +
> + return dc_stream_get_vblank_counter(acrtc->dm_irq_params.stream);
> }
>
> static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,
> @@ -4091,6 +4092,7 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd)
> static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,
> int bl_idx)
> {
> + int ret;
> struct amdgpu_dm_backlight_caps caps;
> struct dc_link *link = (struct dc_link *)dm->backlight_link[bl_idx];
>
> @@ -4105,13 +4107,14 @@ static u32 amdgpu_dm_backlight_get_level(struct amdgpu_display_manager *dm,
> if (!rc)
> return dm->brightness[bl_idx];
> return convert_brightness_to_user(&caps, avg);
> - } else {
> - int ret = dc_link_get_backlight_level(link);
> -
> - if (ret == DC_ERROR_UNEXPECTED)
> - return dm->brightness[bl_idx];
> - return convert_brightness_to_user(&caps, ret);
> }
> +
> + ret = dc_link_get_backlight_level(link);
> +
> + if (ret == DC_ERROR_UNEXPECTED)
> + return dm->brightness[bl_idx];
> +
> + return convert_brightness_to_user(&caps, ret);
> }
>
> static int amdgpu_dm_backlight_get_brightness(struct backlight_device *bd)
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-24 13:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-23 9:31 [PATCH] drm/amd/display: Remove else after return in 'dm_vblank_get_counter' & 'amdgpu_dm_backlight_get_level' Srinivasan Shanmugam
2023-07-24 13:55 ` Rodrigo Siqueira
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.