PM / Runtime: Kconfig: move ia64 dependency to arch/ia64/Kconfig

Message ID 1415917702-6742-1-git-send-email-khilman@kernel.org
State New
Headers show

Commit Message

Kevin Hilman Nov. 13, 2014, 10:28 p.m.
From: Kevin Hilman <khilman@linaro.org>

The IA64_HP_SIM dependency on PM_RUNTIME should be done in the arch
Kconfig instead of in the PM core.  Move it accordingly.

NOTE: arch/ia64/Kconfig currently does a 'select PM', which since
commit 1eb208aea317 (PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP ||
CONFIG_PM_RUNTIME)) is effectively a noop unless PM_SLEEP or
PM_RUNTIME are set elsewhere.

Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
 arch/ia64/Kconfig    | 1 +
 kernel/power/Kconfig | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson Nov. 14, 2014, 7:30 a.m. | #1
On 13 November 2014 23:28, Kevin Hilman <khilman@kernel.org> wrote:
> From: Kevin Hilman <khilman@linaro.org>
>
> The IA64_HP_SIM dependency on PM_RUNTIME should be done in the arch
> Kconfig instead of in the PM core.  Move it accordingly.
>
> NOTE: arch/ia64/Kconfig currently does a 'select PM', which since
> commit 1eb208aea317 (PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP ||
> CONFIG_PM_RUNTIME)) is effectively a noop unless PM_SLEEP or
> PM_RUNTIME are set elsewhere.
>
> Signed-off-by: Kevin Hilman <khilman@linaro.org>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

> ---
>  arch/ia64/Kconfig    | 1 +
>  kernel/power/Kconfig | 1 -
>  2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index c84c88bbbbd7..55bc92ca2ce6 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -233,6 +233,7 @@ config IA64_SGI_UV
>  config IA64_HP_SIM
>         bool "Ski-simulator"
>         select SWIOTLB
> +       depends on !PM_RUNTIME
>
>  endchoice
>
> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> index bbef57f5bdfd..3d39cc0228e9 100644
> --- a/kernel/power/Kconfig
> +++ b/kernel/power/Kconfig
> @@ -131,7 +131,6 @@ config PM_WAKELOCKS_GC
>
>  config PM_RUNTIME
>         bool "Run-time PM core functionality"
> -       depends on !IA64_HP_SIM
>         ---help---
>           Enable functionality allowing I/O devices to be put into energy-saving
>           (low power) states at run time (or autosuspended) after a specified
> --
> 2.1.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c84c88bbbbd7..55bc92ca2ce6 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -233,6 +233,7 @@  config IA64_SGI_UV
 config IA64_HP_SIM
 	bool "Ski-simulator"
 	select SWIOTLB
+	depends on !PM_RUNTIME
 
 endchoice
 
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index bbef57f5bdfd..3d39cc0228e9 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -131,7 +131,6 @@  config PM_WAKELOCKS_GC
 
 config PM_RUNTIME
 	bool "Run-time PM core functionality"
-	depends on !IA64_HP_SIM
 	---help---
 	  Enable functionality allowing I/O devices to be put into energy-saving
 	  (low power) states at run time (or autosuspended) after a specified