[PATCH 1/3] drm/amdgpu: fix warning

[PATCH 1/3] drm/amdgpu: fix warning

[Alex Deucher]

warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Fixes: 8c50db2f64ee ("drm/amdgpu: Adjust error inject function code style in amdgpu_ras.c")
Cc: yipechai <YiPeng.Chai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index aa8d614009d4..478457637d29 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -949,7 +949,7 @@ static void amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
 /* Trigger XGMI/WAFL error */
 static int amdgpu_ras_error_inject_xgmi(struct amdgpu_device *adev,  void *inject_if)
 {
-	int ret = 0;;
+	int ret = 0;
 	struct ta_ras_trigger_error_input *block_info =  (struct ta_ras_trigger_error_input *)inject_if;
 
 	if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_DISALLOW))
-- 
2.33.1

[PATCH 2/3] drm/amdgpu: add a forward declaration for struct amdgpu_iv_entry

[Alex Deucher]

To prevent:
warning: ‘struct amdgpu_iv_entry’ declared inside parameter list will not be visible outside of this definition or declaration

Fixes: 0f60e1036d85 ("drm/amdgpu: Modify the compilation failed problem when other ras blocks' .h include amdgpu_ras.h")
Cc: yipechai <YiPeng.Chai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index f604a2235a9c..7a4d82378205 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -29,6 +29,8 @@
 #include "ta_ras_if.h"
 #include "amdgpu_ras_eeprom.h"
 
+struct amdgpu_iv_entry;
+
 #define AMDGPU_RAS_FLAG_INIT_BY_VBIOS		(0x1 << 0)
 
 enum amdgpu_ras_block {
-- 
2.33.1

[PATCH 3/3] drm/amdgpu: remove unused variable

[Alex Deucher]

No longer used.  remove it.

Fixes: 36324c09d848 ("drm/amdgpu: Modify sdma block to fit for the unified ras block data and ops")
Cc: yipechai <YiPeng.Chai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index b1bedfd4febc..517650d286a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -942,7 +942,6 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev,
 	struct amdgpu_ras_block_object* block_obj = NULL;
 	struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head);
 	struct ras_err_data err_data = {0, 0, 0, NULL};
-	int i;
 
 	if (!obj)
 		return -EINVAL;
-- 
2.33.1

RE: [PATCH 1/3] drm/amdgpu: fix warning

[Zhou1, Tao]

[AMD Official Use Only]

Thanks! The series is:

Reviewed-by: Tao Zhou <tao.zhou1@amd.com>

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: Tuesday, January 11, 2022 4:19 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Chai, Thomas
> <YiPeng.Chai@amd.com>
> Subject: [PATCH 1/3] drm/amdgpu: fix warning
> 
> warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-
> statement]
> 
> Fixes: 8c50db2f64ee ("drm/amdgpu: Adjust error inject function code style in
> amdgpu_ras.c")
> Cc: yipechai <YiPeng.Chai@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> index aa8d614009d4..478457637d29 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> @@ -949,7 +949,7 @@ static void amdgpu_xgmi_query_ras_error_count(struct
> amdgpu_device *adev,
>  /* Trigger XGMI/WAFL error */
>  static int amdgpu_ras_error_inject_xgmi(struct amdgpu_device *adev,  void
> *inject_if)  {
> -	int ret = 0;;
> +	int ret = 0;
>  	struct ta_ras_trigger_error_input *block_info =  (struct
> ta_ras_trigger_error_input *)inject_if;
> 
>  	if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_DISALLOW))
> --
> 2.33.1

Re: [PATCH 1/3] drm/amdgpu: fix warning

[Rodrigo Siqueira Jordao]

On 2022-01-10 3:19 p.m., Alex Deucher wrote:
> warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
> 
> Fixes: 8c50db2f64ee ("drm/amdgpu: Adjust error inject function code style in amdgpu_ras.c")
> Cc: yipechai <YiPeng.Chai@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> index aa8d614009d4..478457637d29 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> @@ -949,7 +949,7 @@ static void amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
>   /* Trigger XGMI/WAFL error */
>   static int amdgpu_ras_error_inject_xgmi(struct amdgpu_device *adev,  void *inject_if)
>   {
> -	int ret = 0;;
> +	int ret = 0;
>   	struct ta_ras_trigger_error_input *block_info =  (struct ta_ras_trigger_error_input *)inject_if;
>   
>   	if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_DISALLOW))
> 

Hi Alex,

This entire series is:

Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>

Thanks.