drm/amd/powerplay: remove variable 'result' set but not used
diff mbox series

Message ID 1573875799-83572-1-git-send-email-chenwandun@huawei.com
State New
Headers show
Series
  • drm/amd/powerplay: remove variable 'result' set but not used
Related show

Commit Message

Chen Wandun Nov. 16, 2019, 3:43 a.m. UTC
Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c: In function vegam_populate_smc_boot_level:
drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c:1364:6: warning: variable result set but not used [-Wunused-but-set-variable]

Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Comments

Quan, Evan Nov. 18, 2019, 6:50 a.m. UTC | #1
Thanks. But it's better to return the 'result' out on 'result != 0'.

Regards,
Evan
-----Original Message-----
From: Chen Wandun <chenwandun@huawei.com> 
Sent: Saturday, November 16, 2019 11:43 AM
To: Deucher, Alexander <Alexander.Deucher@amd.com>; Quan, Evan <Evan.Quan@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org
Cc: chenwandun@huawei.com
Subject: [PATCH] drm/amd/powerplay: remove variable 'result' set but not used

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c: In function vegam_populate_smc_boot_level:
drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c:1364:6: warning: variable result set but not used [-Wunused-but-set-variable]

Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
index 2068eb0..fad78bf 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
@@ -1361,20 +1361,19 @@ static int vegam_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
 static int vegam_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 		struct SMU75_Discrete_DpmTable *table)
 {
-	int result = 0;
 	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 
 	table->GraphicsBootLevel = 0;
 	table->MemoryBootLevel = 0;
 
 	/* find boot level from dpm table */
-	result = phm_find_boot_level(&(data->dpm_table.sclk_table),
-			data->vbios_boot_state.sclk_bootup_value,
-			(uint32_t *)&(table->GraphicsBootLevel));
+	phm_find_boot_level(&(data->dpm_table.sclk_table),
+			    data->vbios_boot_state.sclk_bootup_value,
+			    (uint32_t *)&(table->GraphicsBootLevel));
 
-	result = phm_find_boot_level(&(data->dpm_table.mclk_table),
-			data->vbios_boot_state.mclk_bootup_value,
-			(uint32_t *)&(table->MemoryBootLevel));
+	phm_find_boot_level(&(data->dpm_table.mclk_table),
+			    data->vbios_boot_state.mclk_bootup_value,
+			    (uint32_t *)&(table->MemoryBootLevel));
 
 	table->BootVddc  = data->vbios_boot_state.vddc_bootup_value *
 			VOLTAGE_SCALE;
Chen Wandun Nov. 18, 2019, 7:16 a.m. UTC | #2
OK, it indeed should return the 'result' to caller,
I will make a modification and repost the patch.

Thanks
Chen Wandun

On 2019/11/18 14:50, Quan, Evan wrote:
> Thanks. But it's better to return the 'result' out on 'result != 0'.
> 
> Regards,
> Evan
> -----Original Message-----
> From: Chen Wandun <chenwandun@huawei.com>
> Sent: Saturday, November 16, 2019 11:43 AM
> To: Deucher, Alexander <Alexander.Deucher@amd.com>; Quan, Evan <Evan.Quan@amd.com>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org
> Cc: chenwandun@huawei.com
> Subject: [PATCH] drm/amd/powerplay: remove variable 'result' set but not used
> 
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c: In function vegam_populate_smc_boot_level:
> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c:1364:6: warning: variable result set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: Chen Wandun <chenwandun@huawei.com>
> ---
>   drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 13 ++++++-------
>   1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> index 2068eb0..fad78bf 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> @@ -1361,20 +1361,19 @@ static int vegam_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
>   static int vegam_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
>   		struct SMU75_Discrete_DpmTable *table)
>   {
> -	int result = 0;
>   	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
>   
>   	table->GraphicsBootLevel = 0;
>   	table->MemoryBootLevel = 0;
>   
>   	/* find boot level from dpm table */
> -	result = phm_find_boot_level(&(data->dpm_table.sclk_table),
> -			data->vbios_boot_state.sclk_bootup_value,
> -			(uint32_t *)&(table->GraphicsBootLevel));
> +	phm_find_boot_level(&(data->dpm_table.sclk_table),
> +			    data->vbios_boot_state.sclk_bootup_value,
> +			    (uint32_t *)&(table->GraphicsBootLevel));
>   
> -	result = phm_find_boot_level(&(data->dpm_table.mclk_table),
> -			data->vbios_boot_state.mclk_bootup_value,
> -			(uint32_t *)&(table->MemoryBootLevel));
> +	phm_find_boot_level(&(data->dpm_table.mclk_table),
> +			    data->vbios_boot_state.mclk_bootup_value,
> +			    (uint32_t *)&(table->MemoryBootLevel));
>   
>   	table->BootVddc  = data->vbios_boot_state.vddc_bootup_value *
>   			VOLTAGE_SCALE;
>
Quan, Evan Nov. 18, 2019, 8:15 a.m. UTC | #3
Reviewed-by: Evan Quan <evan.quan@amd.com>

> -----Original Message-----
> From: Chen Wandun <chenwandun@huawei.com>
> Sent: Monday, November 18, 2019 4:04 PM
> To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander
> <Alexander.Deucher@amd.com>; amd-gfx@lists.freedesktop.org; linux-
> kernel@vger.kernel.org; dri-devel@lists.freedesktop.org
> Cc: chenwandun@huawei.com
> Subject: [PATCH v2] drm/amd/powerplay: return errno code to caller when
> error occur
> 
> return errno code to caller when error occur, and meanwhile remove gcc '-
> Wunused-but-set-variable' warning.
> 
> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c: In
> function vegam_populate_smc_boot_level:
> drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c:1364:
> 6: warning: variable result set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: Chen Wandun <chenwandun@huawei.com>
> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> index 2068eb0..50896e9 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> @@ -1371,11 +1371,16 @@ static int vegam_populate_smc_boot_level(struct
> pp_hwmgr *hwmgr,
>  	result = phm_find_boot_level(&(data->dpm_table.sclk_table),
>  			data->vbios_boot_state.sclk_bootup_value,
>  			(uint32_t *)&(table->GraphicsBootLevel));
> +	if (result)
> +		return result;
> 
>  	result = phm_find_boot_level(&(data->dpm_table.mclk_table),
>  			data->vbios_boot_state.mclk_bootup_value,
>  			(uint32_t *)&(table->MemoryBootLevel));
> 
> +	if (result)
> +		return result;
> +
>  	table->BootVddc  = data->vbios_boot_state.vddc_bootup_value *
>  			VOLTAGE_SCALE;
>  	table->BootVddci = data->vbios_boot_state.vddci_bootup_value *
> --
> 2.7.4
Alex Deucher Nov. 18, 2019, 8:24 p.m. UTC | #4
Applied.  Thanks!

Alex

On Mon, Nov 18, 2019 at 3:15 AM Quan, Evan <Evan.Quan@amd.com> wrote:
>
> Reviewed-by: Evan Quan <evan.quan@amd.com>
>
> > -----Original Message-----
> > From: Chen Wandun <chenwandun@huawei.com>
> > Sent: Monday, November 18, 2019 4:04 PM
> > To: Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander
> > <Alexander.Deucher@amd.com>; amd-gfx@lists.freedesktop.org; linux-
> > kernel@vger.kernel.org; dri-devel@lists.freedesktop.org
> > Cc: chenwandun@huawei.com
> > Subject: [PATCH v2] drm/amd/powerplay: return errno code to caller when
> > error occur
> >
> > return errno code to caller when error occur, and meanwhile remove gcc '-
> > Wunused-but-set-variable' warning.
> >
> > drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c: In
> > function vegam_populate_smc_boot_level:
> > drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/vegam_smumgr.c:1364:
> > 6: warning: variable result set but not used [-Wunused-but-set-variable]
> >
> > Signed-off-by: Chen Wandun <chenwandun@huawei.com>
> > ---
> >  drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> > b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> > index 2068eb0..50896e9 100644
> > --- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
> > @@ -1371,11 +1371,16 @@ static int vegam_populate_smc_boot_level(struct
> > pp_hwmgr *hwmgr,
> >       result = phm_find_boot_level(&(data->dpm_table.sclk_table),
> >                       data->vbios_boot_state.sclk_bootup_value,
> >                       (uint32_t *)&(table->GraphicsBootLevel));
> > +     if (result)
> > +             return result;
> >
> >       result = phm_find_boot_level(&(data->dpm_table.mclk_table),
> >                       data->vbios_boot_state.mclk_bootup_value,
> >                       (uint32_t *)&(table->MemoryBootLevel));
> >
> > +     if (result)
> > +             return result;
> > +
> >       table->BootVddc  = data->vbios_boot_state.vddc_bootup_value *
> >                       VOLTAGE_SCALE;
> >       table->BootVddci = data->vbios_boot_state.vddci_bootup_value *
> > --
> > 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Patch
diff mbox series

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
index 2068eb0..fad78bf 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
@@ -1361,20 +1361,19 @@  static int vegam_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
 static int vegam_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 		struct SMU75_Discrete_DpmTable *table)
 {
-	int result = 0;
 	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 
 	table->GraphicsBootLevel = 0;
 	table->MemoryBootLevel = 0;
 
 	/* find boot level from dpm table */
-	result = phm_find_boot_level(&(data->dpm_table.sclk_table),
-			data->vbios_boot_state.sclk_bootup_value,
-			(uint32_t *)&(table->GraphicsBootLevel));
+	phm_find_boot_level(&(data->dpm_table.sclk_table),
+			    data->vbios_boot_state.sclk_bootup_value,
+			    (uint32_t *)&(table->GraphicsBootLevel));
 
-	result = phm_find_boot_level(&(data->dpm_table.mclk_table),
-			data->vbios_boot_state.mclk_bootup_value,
-			(uint32_t *)&(table->MemoryBootLevel));
+	phm_find_boot_level(&(data->dpm_table.mclk_table),
+			    data->vbios_boot_state.mclk_bootup_value,
+			    (uint32_t *)&(table->MemoryBootLevel));
 
 	table->BootVddc  = data->vbios_boot_state.vddc_bootup_value *
 			VOLTAGE_SCALE;