Commit 53e1db06 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amd/display: Remove else after return in 'dm_vblank_get_counter' &... 


drm/amd/display: Remove else after return in 'dm_vblank_get_counter' & 'amdgpu_dm_backlight_get_level'

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 function 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: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50fbe0cc

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+17 −14
Original line number Diff line number Diff line
@@ -245,12 +245,14 @@ 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) {

	acrtc = adev->mode_info.crtcs[crtc];



	if (!acrtc->dm_irq_params.stream) {

		DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",

			  crtc);

		return 0;
@@ -258,7 +260,6 @@ static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc) 


	return dc_stream_get_vblank_counter(acrtc->dm_irq_params.stream);

}

}



static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc,

				  u32 *vbl, u32 *position)
@@ -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,14 +4107,15 @@ 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);

	}



	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)

{