diff mbox series

[V2] cpufreq: airoha: modify CONFIG_OF dependency

Message ID 9d51d2710061dfa7f2568287c6ed125b858b7318.1738580005.git.viresh.kumar@linaro.org (mailing list archive)
State Queued
Delegated to: Rafael Wysocki
Headers show
Series [V2] cpufreq: airoha: modify CONFIG_OF dependency | expand

Commit Message

Viresh Kumar Feb. 3, 2025, 10:54 a.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

Compile-testing without CONFIG_OF leads to a harmless build warning:

drivers/cpufreq/airoha-cpufreq.c:109:34: error: 'airoha_cpufreq_match_list' defined but not used [-Werror=unused-const-variable=]
  109 | static const struct of_device_id airoha_cpufreq_match_list[] __initconst = {
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~

It would be possible to mark the variable as __maybe_unused to shut up
that warning, but a Kconfig dependency seems more appropriate as this still
allows build testing in allmodconfig and randconfig builds on all
architectures.

An earlier commit, b865a8404642 ("cpufreq: airoha: Depends on OF"),
tried to fix it incorrectly. ARCH_AIROHA already requires CONFIG_OF, so
this change does nothing, and the dependency is still missing for the
COMPILE_TEST case.

Fix it properly.

Fixes: 84cf9e541ccc ("cpufreq: airoha: Add EN7581 CPUFreq SMCCC driver")
Fixes: b865a8404642 ("cpufreq: airoha: Depends on OF")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[ Viresh: updated commit log and fixed rebase conflict ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
V2:
- Fixed rebase conflicts.
- Updated commit log.

 drivers/cpufreq/Kconfig.arm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Rafael J. Wysocki Feb. 5, 2025, 8 p.m. UTC | #1
On Mon, Feb 3, 2025 at 11:54 AM Viresh Kumar <viresh.kumar@linaro.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Compile-testing without CONFIG_OF leads to a harmless build warning:
>
> drivers/cpufreq/airoha-cpufreq.c:109:34: error: 'airoha_cpufreq_match_list' defined but not used [-Werror=unused-const-variable=]
>   109 | static const struct of_device_id airoha_cpufreq_match_list[] __initconst = {
>       |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> It would be possible to mark the variable as __maybe_unused to shut up
> that warning, but a Kconfig dependency seems more appropriate as this still
> allows build testing in allmodconfig and randconfig builds on all
> architectures.
>
> An earlier commit, b865a8404642 ("cpufreq: airoha: Depends on OF"),
> tried to fix it incorrectly. ARCH_AIROHA already requires CONFIG_OF, so
> this change does nothing, and the dependency is still missing for the
> COMPILE_TEST case.
>
> Fix it properly.
>
> Fixes: 84cf9e541ccc ("cpufreq: airoha: Add EN7581 CPUFreq SMCCC driver")
> Fixes: b865a8404642 ("cpufreq: airoha: Depends on OF")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> [ Viresh: updated commit log and fixed rebase conflict ]
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> V2:
> - Fixed rebase conflicts.
> - Updated commit log.
>
>  drivers/cpufreq/Kconfig.arm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
> index 0ee5c691fb36..9e46960f6a86 100644
> --- a/drivers/cpufreq/Kconfig.arm
> +++ b/drivers/cpufreq/Kconfig.arm
> @@ -17,7 +17,8 @@ config ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM
>
>  config ARM_AIROHA_SOC_CPUFREQ
>         tristate "Airoha EN7581 SoC CPUFreq support"
> -       depends on (ARCH_AIROHA && OF) || COMPILE_TEST
> +       depends on ARCH_AIROHA || COMPILE_TEST
> +       depends on OF
>         select PM_OPP
>         default ARCH_AIROHA
>         help
> --

Applied as 6.14-rc material, thanks!
diff mbox series

Patch

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 0ee5c691fb36..9e46960f6a86 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -17,7 +17,8 @@  config ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM
 
 config ARM_AIROHA_SOC_CPUFREQ
 	tristate "Airoha EN7581 SoC CPUFreq support"
-	depends on (ARCH_AIROHA && OF) || COMPILE_TEST
+	depends on ARCH_AIROHA || COMPILE_TEST
+	depends on OF
 	select PM_OPP
 	default ARCH_AIROHA
 	help