2022-11-08 17:29:03

by Nathan Chancellor

[permalink] [raw]
Subject: [PATCH] cpufreq: ACPI: Remove unused variables 'acpi_cpufreq_online' and 'ret'

Clang warns:

drivers/cpufreq/acpi-cpufreq.c:970:24: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
acpi_cpufreq_online = ret;
^~~
drivers/cpufreq/acpi-cpufreq.c:960:9: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 0
1 error generated.

Both ret and acpi_cpufreq_online are now unused so they can be safely
removed, clearing up the warning.

Fixes: 13fdbc8b8da6 ("cpufreq: ACPI: Defer setting boost MSRs")
Link: https://github.com/ClangBuiltLinux/linux/issues/1757
Signed-off-by: Nathan Chancellor <[email protected]>
---
drivers/cpufreq/acpi-cpufreq.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index c8fdfcf659e6..74ef0e05ff7b 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -953,12 +953,8 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
.attr = acpi_cpufreq_attr,
};

-static enum cpuhp_state acpi_cpufreq_online;
-
static void __init acpi_cpufreq_boost_init(void)
{
- int ret;
-
if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA))) {
pr_debug("Boost capabilities not present in the processor\n");
return;
@@ -966,8 +962,6 @@ static void __init acpi_cpufreq_boost_init(void)

acpi_cpufreq_driver.set_boost = set_boost;
acpi_cpufreq_driver.boost_enabled = boost_state(0);
-
- acpi_cpufreq_online = ret;
}

static int __init acpi_cpufreq_init(void)

base-commit: 21cdb6c18f85fe538ca8740bc79f11fbe08d0197
--
2.38.1



2022-11-10 22:17:10

by Nick Desaulniers

[permalink] [raw]
Subject: Re: [PATCH] cpufreq: ACPI: Remove unused variables 'acpi_cpufreq_online' and 'ret'

On Tue, Nov 8, 2022 at 9:01 AM Nathan Chancellor <[email protected]> wrote:
>
> Clang warns:
>
> drivers/cpufreq/acpi-cpufreq.c:970:24: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
> acpi_cpufreq_online = ret;
> ^~~
> drivers/cpufreq/acpi-cpufreq.c:960:9: note: initialize the variable 'ret' to silence this warning
> int ret;
> ^
> = 0
> 1 error generated.
>
> Both ret and acpi_cpufreq_online are now unused so they can be safely
> removed, clearing up the warning.
>
> Fixes: 13fdbc8b8da6 ("cpufreq: ACPI: Defer setting boost MSRs")
> Link: https://github.com/ClangBuiltLinux/linux/issues/1757
> Signed-off-by: Nathan Chancellor <[email protected]>

Thanks for the patch!

Reviewed-by: Nick Desaulniers <[email protected]>

> ---
> drivers/cpufreq/acpi-cpufreq.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index c8fdfcf659e6..74ef0e05ff7b 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -953,12 +953,8 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
> .attr = acpi_cpufreq_attr,
> };
>
> -static enum cpuhp_state acpi_cpufreq_online;
> -
> static void __init acpi_cpufreq_boost_init(void)
> {
> - int ret;
> -
> if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA))) {
> pr_debug("Boost capabilities not present in the processor\n");
> return;
> @@ -966,8 +962,6 @@ static void __init acpi_cpufreq_boost_init(void)
>
> acpi_cpufreq_driver.set_boost = set_boost;
> acpi_cpufreq_driver.boost_enabled = boost_state(0);
> -
> - acpi_cpufreq_online = ret;
> }
>
> static int __init acpi_cpufreq_init(void)
>
> base-commit: 21cdb6c18f85fe538ca8740bc79f11fbe08d0197
> --
> 2.38.1
>


--
Thanks,
~Nick Desaulniers

2022-11-16 20:06:07

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] cpufreq: ACPI: Remove unused variables 'acpi_cpufreq_online' and 'ret'

On Wed, Nov 16, 2022 at 08:50:41PM +0100, Rafael J. Wysocki wrote:
> On Wed, Nov 16, 2022 at 8:34 PM Nathan Chancellor <[email protected]> wrote:
> >
> > Hi all,
> >
> > Small ping, was there an issue with this change? It seems pretty
> > straight forward to me and it is wreaking havoc on our build matrix due
> > to -Werror.
>
> Applied now, thanks!

Thanks a lot!

> > On Tue, Nov 08, 2022 at 10:01:03AM -0700, Nathan Chancellor wrote:
> > > Clang warns:
> > >
> > > drivers/cpufreq/acpi-cpufreq.c:970:24: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
> > > acpi_cpufreq_online = ret;
> > > ^~~
> > > drivers/cpufreq/acpi-cpufreq.c:960:9: note: initialize the variable 'ret' to silence this warning
> > > int ret;
> > > ^
> > > = 0
> > > 1 error generated.
> > >
> > > Both ret and acpi_cpufreq_online are now unused so they can be safely
> > > removed, clearing up the warning.
> > >
> > > Fixes: 13fdbc8b8da6 ("cpufreq: ACPI: Defer setting boost MSRs")
> > > Link: https://github.com/ClangBuiltLinux/linux/issues/1757
> > > Signed-off-by: Nathan Chancellor <[email protected]>
> > > ---
> > > drivers/cpufreq/acpi-cpufreq.c | 6 ------
> > > 1 file changed, 6 deletions(-)
> > >
> > > diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> > > index c8fdfcf659e6..74ef0e05ff7b 100644
> > > --- a/drivers/cpufreq/acpi-cpufreq.c
> > > +++ b/drivers/cpufreq/acpi-cpufreq.c
> > > @@ -953,12 +953,8 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
> > > .attr = acpi_cpufreq_attr,
> > > };
> > >
> > > -static enum cpuhp_state acpi_cpufreq_online;
> > > -
> > > static void __init acpi_cpufreq_boost_init(void)
> > > {
> > > - int ret;
> > > -
> > > if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA))) {
> > > pr_debug("Boost capabilities not present in the processor\n");
> > > return;
> > > @@ -966,8 +962,6 @@ static void __init acpi_cpufreq_boost_init(void)
> > >
> > > acpi_cpufreq_driver.set_boost = set_boost;
> > > acpi_cpufreq_driver.boost_enabled = boost_state(0);
> > > -
> > > - acpi_cpufreq_online = ret;
> > > }
> > >
> > > static int __init acpi_cpufreq_init(void)
> > >
> > > base-commit: 21cdb6c18f85fe538ca8740bc79f11fbe08d0197
> > > --
> > > 2.38.1
> > >

2022-11-16 20:06:24

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] cpufreq: ACPI: Remove unused variables 'acpi_cpufreq_online' and 'ret'

Hi all,

Small ping, was there an issue with this change? It seems pretty
straight forward to me and it is wreaking havoc on our build matrix due
to -Werror.

Cheers,
Nathan

On Tue, Nov 08, 2022 at 10:01:03AM -0700, Nathan Chancellor wrote:
> Clang warns:
>
> drivers/cpufreq/acpi-cpufreq.c:970:24: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
> acpi_cpufreq_online = ret;
> ^~~
> drivers/cpufreq/acpi-cpufreq.c:960:9: note: initialize the variable 'ret' to silence this warning
> int ret;
> ^
> = 0
> 1 error generated.
>
> Both ret and acpi_cpufreq_online are now unused so they can be safely
> removed, clearing up the warning.
>
> Fixes: 13fdbc8b8da6 ("cpufreq: ACPI: Defer setting boost MSRs")
> Link: https://github.com/ClangBuiltLinux/linux/issues/1757
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> drivers/cpufreq/acpi-cpufreq.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index c8fdfcf659e6..74ef0e05ff7b 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -953,12 +953,8 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
> .attr = acpi_cpufreq_attr,
> };
>
> -static enum cpuhp_state acpi_cpufreq_online;
> -
> static void __init acpi_cpufreq_boost_init(void)
> {
> - int ret;
> -
> if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA))) {
> pr_debug("Boost capabilities not present in the processor\n");
> return;
> @@ -966,8 +962,6 @@ static void __init acpi_cpufreq_boost_init(void)
>
> acpi_cpufreq_driver.set_boost = set_boost;
> acpi_cpufreq_driver.boost_enabled = boost_state(0);
> -
> - acpi_cpufreq_online = ret;
> }
>
> static int __init acpi_cpufreq_init(void)
>
> base-commit: 21cdb6c18f85fe538ca8740bc79f11fbe08d0197
> --
> 2.38.1
>

2022-11-16 20:13:01

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] cpufreq: ACPI: Remove unused variables 'acpi_cpufreq_online' and 'ret'

On Wed, Nov 16, 2022 at 8:34 PM Nathan Chancellor <[email protected]> wrote:
>
> Hi all,
>
> Small ping, was there an issue with this change? It seems pretty
> straight forward to me and it is wreaking havoc on our build matrix due
> to -Werror.

Applied now, thanks!

> On Tue, Nov 08, 2022 at 10:01:03AM -0700, Nathan Chancellor wrote:
> > Clang warns:
> >
> > drivers/cpufreq/acpi-cpufreq.c:970:24: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized]
> > acpi_cpufreq_online = ret;
> > ^~~
> > drivers/cpufreq/acpi-cpufreq.c:960:9: note: initialize the variable 'ret' to silence this warning
> > int ret;
> > ^
> > = 0
> > 1 error generated.
> >
> > Both ret and acpi_cpufreq_online are now unused so they can be safely
> > removed, clearing up the warning.
> >
> > Fixes: 13fdbc8b8da6 ("cpufreq: ACPI: Defer setting boost MSRs")
> > Link: https://github.com/ClangBuiltLinux/linux/issues/1757
> > Signed-off-by: Nathan Chancellor <[email protected]>
> > ---
> > drivers/cpufreq/acpi-cpufreq.c | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> > index c8fdfcf659e6..74ef0e05ff7b 100644
> > --- a/drivers/cpufreq/acpi-cpufreq.c
> > +++ b/drivers/cpufreq/acpi-cpufreq.c
> > @@ -953,12 +953,8 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
> > .attr = acpi_cpufreq_attr,
> > };
> >
> > -static enum cpuhp_state acpi_cpufreq_online;
> > -
> > static void __init acpi_cpufreq_boost_init(void)
> > {
> > - int ret;
> > -
> > if (!(boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA))) {
> > pr_debug("Boost capabilities not present in the processor\n");
> > return;
> > @@ -966,8 +962,6 @@ static void __init acpi_cpufreq_boost_init(void)
> >
> > acpi_cpufreq_driver.set_boost = set_boost;
> > acpi_cpufreq_driver.boost_enabled = boost_state(0);
> > -
> > - acpi_cpufreq_online = ret;
> > }
> >
> > static int __init acpi_cpufreq_init(void)
> >
> > base-commit: 21cdb6c18f85fe538ca8740bc79f11fbe08d0197
> > --
> > 2.38.1
> >