Message ID | 20240403080702.3509288-28-arnd@kernel.org (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | address all -Wunused-const warnings | expand |
On Wed, Apr 3, 2024 at 10:11 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > The reference to this variable is hidden in an #ifdef: > > drivers/cpufreq/intel_pstate.c:2440:32: error: 'intel_pstate_cpu_oob_ids' defined but not used [-Werror=unused-const-variable=] > > Use the same check around the definition. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/cpufreq/intel_pstate.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c > index dbbf299f4219..29ce9edc6f68 100644 > --- a/drivers/cpufreq/intel_pstate.c > +++ b/drivers/cpufreq/intel_pstate.c > @@ -2437,6 +2437,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { > }; > MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); > > +#ifdef CONFIG_ACPI > static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { > X86_MATCH(BROADWELL_D, core_funcs), > X86_MATCH(BROADWELL_X, core_funcs), > @@ -2445,6 +2446,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { > X86_MATCH(SAPPHIRERAPIDS_X, core_funcs), > {} > }; > +#endif > > static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { > X86_MATCH(KABYLAKE, core_funcs), > -- Applied as 6.10 material, thanks!
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index dbbf299f4219..29ce9edc6f68 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2437,6 +2437,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { }; MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); +#ifdef CONFIG_ACPI static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { X86_MATCH(BROADWELL_D, core_funcs), X86_MATCH(BROADWELL_X, core_funcs), @@ -2445,6 +2446,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { X86_MATCH(SAPPHIRERAPIDS_X, core_funcs), {} }; +#endif static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { X86_MATCH(KABYLAKE, core_funcs),