diff mbox series

cpufreq/amd-pstate: Avoid shadowing ret in amd_pstate_ut_check_driver()

Message ID 20250512-amd-pstate-ut-uninit-ret-v1-1-fcb4104f502e@kernel.org
State Accepted
Commit f6b1eebbdbc75377f98fc9774bb86ffc270dae8e
Headers show
Series cpufreq/amd-pstate: Avoid shadowing ret in amd_pstate_ut_check_driver() | expand

Commit Message

Nathan Chancellor May 12, 2025, 9:28 p.m. UTC
Clang warns (or errors with CONFIG_WERROR=y):

  drivers/cpufreq/amd-pstate-ut.c:262:6: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
    262 |         if (ret)
        |             ^~~

ret is declared at the top of the function and in the for loop so the
initialization of ret is local to the loop. Remove the declaration in
the for loop so that ret is always used initialized.

Fixes: d26d16438bc5 ("amd-pstate-ut: Reset amd-pstate driver mode after running selftests")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505072226.g2QclhaR-lkp@intel.com/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 drivers/cpufreq/amd-pstate-ut.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: b01fc4eca73cbd7946181255a95dbe64ff83bc5f
change-id: 20250512-amd-pstate-ut-uninit-ret-46a23a195687

Best regards,

Comments

Mario Limonciello May 13, 2025, 4:14 p.m. UTC | #1
On 5/12/2025 4:28 PM, Nathan Chancellor wrote:
> Clang warns (or errors with CONFIG_WERROR=y):
> 
>    drivers/cpufreq/amd-pstate-ut.c:262:6: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
>      262 |         if (ret)
>          |             ^~~
> 
> ret is declared at the top of the function and in the for loop so the
> initialization of ret is local to the loop. Remove the declaration in
> the for loop so that ret is always used initialized.
> 
> Fixes: d26d16438bc5 ("amd-pstate-ut: Reset amd-pstate driver mode after running selftests")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202505072226.g2QclhaR-lkp@intel.com/
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
>   drivers/cpufreq/amd-pstate-ut.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
> index 30835d0e4994..65f9d2bae2d3 100644
> --- a/drivers/cpufreq/amd-pstate-ut.c
> +++ b/drivers/cpufreq/amd-pstate-ut.c
> @@ -246,7 +246,7 @@ static int amd_pstate_ut_check_driver(u32 index)
>   	int ret;
>   
>   	for (mode1 = AMD_PSTATE_DISABLE; mode1 < AMD_PSTATE_MAX; mode1++) {
> -		int ret = amd_pstate_set_mode(mode1);
> +		ret = amd_pstate_set_mode(mode1);
>   		if (ret)
>   			return ret;
>   		for (mode2 = AMD_PSTATE_DISABLE; mode2 < AMD_PSTATE_MAX; mode2++) {
> 
> ---
> base-commit: b01fc4eca73cbd7946181255a95dbe64ff83bc5f
> change-id: 20250512-amd-pstate-ut-uninit-ret-46a23a195687
> 
> Best regards,

Much appreciated.

Acked-by: Mario Limonciello <mario.limonciello@amd.com>

Applied to superm1/bleeding-edge.
diff mbox series

Patch

diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
index 30835d0e4994..65f9d2bae2d3 100644
--- a/drivers/cpufreq/amd-pstate-ut.c
+++ b/drivers/cpufreq/amd-pstate-ut.c
@@ -246,7 +246,7 @@  static int amd_pstate_ut_check_driver(u32 index)
 	int ret;
 
 	for (mode1 = AMD_PSTATE_DISABLE; mode1 < AMD_PSTATE_MAX; mode1++) {
-		int ret = amd_pstate_set_mode(mode1);
+		ret = amd_pstate_set_mode(mode1);
 		if (ret)
 			return ret;
 		for (mode2 = AMD_PSTATE_DISABLE; mode2 < AMD_PSTATE_MAX; mode2++) {