Re: [PATCH] drm/amdgpu: Drop unnecessary return statements

[Christian König <ckoenig.leichtzumerken@xxxxxxxxx>]

Am 30.09.23 um 06:07 schrieb Srinivasan Shanmugam:
> There is no reason to call return at the end of function that
> returns void.
>
> Fixes the below:
>
> WARNING: void function return statements are not generally useful
>
> Thus remove such a statement in the affected functions.
>
> Cc: Christian König <christian.koenig@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: "Pan, Xinhui" <Xinhui.Pan@xxxxxxx>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx>

Reviewed-by: Christian König <christian.koenig@xxxxxxx>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 1 -
>   drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 -
>   drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c        | 2 --
>   drivers/gpu/drm/amd/amdgpu/ih_v6_0.c           | 4 ----
>   drivers/gpu/drm/amd/amdgpu/navi10_ih.c         | 4 ----
>   drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c         | 3 ---
>   drivers/gpu/drm/amd/amdgpu/nv.c                | 2 --
>   drivers/gpu/drm/amd/amdgpu/soc21.c             | 2 --
>   drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c          | 2 --
>   9 files changed, 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
> index 3c988cc406e4..381101d2bf05 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
> @@ -112,7 +112,6 @@ static inline void amdgpu_res_first(struct ttm_resource *res,
>   	cur->remaining = size;
>   	cur->node = NULL;
>   	WARN_ON(res && start + size > res->size);
> -	return;
>   }
>   
>   /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> index d95b2dc78063..3ee219aa2891 100644
> --- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> +++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> @@ -228,7 +228,6 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode
>   register_acpi_backlight:
>   	/* Try registering an ACPI video backlight device instead. */
>   	acpi_video_register_backlight();
> -	return;
>   }
>   
>   void
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
> index e7ae37233234..065b2bd5f5a6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
> @@ -746,8 +746,6 @@ void gfx_v9_4_2_init_golden_registers(struct amdgpu_device *adev,
>   			 die_id);
>   		break;
>   	}
> -
> -	return;
>   }
>   
>   void gfx_v9_4_2_debug_trap_config_init(struct amdgpu_device *adev,
> diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
> index ec0c8f8b465a..d9ed7332d805 100644
> --- a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
> @@ -641,8 +641,6 @@ static void ih_v6_0_update_clockgating_state(struct amdgpu_device *adev,
>   		if (def != data)
>   			WREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL, data);
>   	}
> -
> -	return;
>   }
>   
>   static int ih_v6_0_set_clockgating_state(void *handle,
> @@ -726,8 +724,6 @@ static void ih_v6_0_get_clockgating_state(void *handle, u64 *flags)
>   
>   	if (!RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL))
>   		*flags |= AMD_CG_SUPPORT_IH_CG;
> -
> -	return;
>   }
>   
>   static const struct amd_ip_funcs ih_v6_0_ip_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
> index bb1873363d75..e64b33115848 100644
> --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
> @@ -665,8 +665,6 @@ static void navi10_ih_update_clockgating_state(struct amdgpu_device *adev,
>   		if (def != data)
>   			WREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL, data);
>   	}
> -
> -	return;
>   }
>   
>   static int navi10_ih_set_clockgating_state(void *handle,
> @@ -691,8 +689,6 @@ static void navi10_ih_get_clockgating_state(void *handle, u64 *flags)
>   
>   	if (!RREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL))
>   		*flags |= AMD_CG_SUPPORT_IH_CG;
> -
> -	return;
>   }
>   
>   static const struct amd_ip_funcs navi10_ih_ip_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
> index f85eec05d218..cc034a740605 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
> @@ -173,8 +173,6 @@ static void nbio_v7_9_sdma_doorbell_range(struct amdgpu_device *adev, int instan
>   	default:
>   		break;
>   	}
> -
> -	return;
>   }
>   
>   static void nbio_v7_9_vcn_doorbell_range(struct amdgpu_device *adev, bool use_doorbell,
> @@ -556,7 +554,6 @@ const struct amdgpu_nbio_funcs nbio_v7_9_funcs = {
>   static void nbio_v7_9_query_ras_error_count(struct amdgpu_device *adev,
>   					void *ras_error_status)
>   {
> -	return;
>   }
>   
>   static void nbio_v7_9_handle_ras_controller_intr_no_bifring(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 0535cabe3b16..1995c7459f20 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -1115,8 +1115,6 @@ static void nv_common_get_clockgating_state(void *handle, u64 *flags)
>   	adev->hdp.funcs->get_clock_gating_state(adev, flags);
>   
>   	adev->smuio.funcs->get_clock_gating_state(adev, flags);
> -
> -	return;
>   }
>   
>   static const struct amd_ip_funcs nv_common_ip_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
> index 92a80780ab72..6fcc4f7be117 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc21.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
> @@ -885,8 +885,6 @@ static void soc21_common_get_clockgating_state(void *handle, u64 *flags)
>   	adev->nbio.funcs->get_clockgating_state(adev, flags);
>   
>   	adev->hdp.funcs->get_clock_gating_state(adev, flags);
> -
> -	return;
>   }
>   
>   static const struct amd_ip_funcs soc21_common_ip_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 96831f931423..88e17f5e20b2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -877,8 +877,6 @@ static void vcn_v4_0_enable_clock_gating(struct amdgpu_device *adev, int inst)
>   		| UVD_SUVD_CGC_CTRL__IME_MODE_MASK
>   		| UVD_SUVD_CGC_CTRL__SITE_MODE_MASK);
>   	WREG32_SOC15(VCN, inst, regUVD_SUVD_CGC_CTRL, data);
> -
> -	return;
>   }
>   
>   static void vcn_v4_0_enable_ras(struct amdgpu_device *adev, int inst_idx,