amd-pstate changes for 6.16 (5/15/25)

Fix an error caught with -Werror in amd-pstate-ut.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEECwtuSU6dXvs5GA2aLRkspiR3AnYFAmgmSekaHG1hcmlvLmxp
 bW9uY2llbGxvQGFtZC5jb20ACgkQLRkspiR3AnYs7BAA0lYBgiko019KdK429T9V
 QcQ18Q0+u3+OOaWZFJJVghDhNmICVH6CTdvPTrOVhwD4C8xcmcY5OjgGcp5Fgwsr
 Nx6tosRY65E0x7wZSINYzAH8Ri2xf66kzGmt19kw/+FtkseXRRR1ukXEbBEaN7nj
 6ro1iEWM0ANpKX3wclG6a0MQ+yTpE1+A8oQdANikTiEWZ7PwbVmV2gV1XQtrQ87k
 GZ6+mOLDdBXbPpkgW6w6hSecOsYQQdcdQBWX2pEqB8yG2iP3tByGF0pe/ORhH1DR
 XnFM8K3K8wwqnecogFc1QbZrfnx3/h9OoigIsi0JR0vFx7C88aBdRv6UAMLkniWN
 gLNsTEsy1OUIkY7Dp2wJdJUJtWl8+k7U9kCFz1GMzt6aGq3s9J2zt9Q/5HxOMZhJ
 BmobFR5dLLLERRCmVK33QkMw4QvQs0zyeWxdeJeIi9D0DcvI6cZI4mH2YB878esq
 nNW00s4yZpXftekgsA5e4TpHVgYdZ/sYR1cTJYuGPWH6yr2CAqXKqTItjiQq8T4r
 bgMxWo5PceyPgPBUn5FO36LPFemfsQ7DXPKS6KbW8LzcfbVCZSfL561dg/La0+e2
 ZKJFBvsU6LgFATf8YBQxTV/Kr7/ihYx3DbtB4mEWu9/piYBHlBsmYmofparFPSpK
 QJBmh4GpDj54r27esKeJuWk=
 =IUvq
 -----END PGP SIGNATURE-----

Merge tag 'amd-pstate-v6.16-2025-05-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux

Merge an amd-pstate driver fix for 6.16 (5/15/25) from Mario
Liminciello:

"Fix an error caught with -Werror in amd-pstate-ut."

* tag 'amd-pstate-v6.16-2025-05-15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux:
  cpufreq/amd-pstate: Avoid shadowing ret in amd_pstate_ut_check_driver()
This commit is contained in:
Rafael J. Wysocki 2025-05-16 18:39:08 +02:00
commit fd3d883aa5

View File

@ -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++) {