[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Jean Pihet]

The current code base is not linking with the OMAP_PM_NONE
option set.
Since the option OMAP_PM_NOOP provides a no-op/debug layer,
OMAP_PM_NONE can be removed.
OMAP_PM_NOOP is enabled by default by Kconfig.

Signed-off-by: Jean Pihet <j-pihet@ti.com>
---
 arch/arm/plat-omap/Kconfig                |    3 ---
 arch/arm/plat-omap/include/plat/omap-pm.h |    8 --------
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index cd5f993..16e3293 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -209,9 +209,6 @@ choice
 	depends on ARCH_OMAP
 	default OMAP_PM_NOOP
 
-config OMAP_PM_NONE
-	bool "No PM layer"
-
 config OMAP_PM_NOOP
 	bool "No-op/debug PM layer"
 
diff --git a/arch/arm/plat-omap/include/plat/omap-pm.h b/arch/arm/plat-omap/include/plat/omap-pm.h
index c0a7520..0840df8 100644
--- a/arch/arm/plat-omap/include/plat/omap-pm.h
+++ b/arch/arm/plat-omap/include/plat/omap-pm.h
@@ -40,11 +40,7 @@
  * framework starts.  The "_if_" is to avoid name collisions with the
  * PM idle-loop code.
  */
-#ifdef CONFIG_OMAP_PM_NONE
-#define omap_pm_if_early_init() 0
-#else
 int __init omap_pm_if_early_init(void);
-#endif
 
 /**
  * omap_pm_if_init - OMAP PM init code called after clock fw init
@@ -52,11 +48,7 @@ int __init omap_pm_if_early_init(void);
  * The main initialization code.  OPP tables are passed in here.  The
  * "_if_" is to avoid name collisions with the PM idle-loop code.
  */
-#ifdef CONFIG_OMAP_PM_NONE
-#define omap_pm_if_init() 0
-#else
 int __init omap_pm_if_init(void);
-#endif
 
 /**
  * omap_pm_if_exit - OMAP PM exit code
-- 
1.7.1

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Jean Pihet]

Please note that this code is based on khilman's for_2.6.40/pm-cleanup branch.

Jean

On Fri, May 6, 2011 at 11:11 AM, Jean Pihet <jean.pihet@newoldbits.com> wrote:
> The current code base is not linking with the OMAP_PM_NONE
> option set.
> Since the option OMAP_PM_NOOP provides a no-op/debug layer,
> OMAP_PM_NONE can be removed.
> OMAP_PM_NOOP is enabled by default by Kconfig.
>
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
> ?arch/arm/plat-omap/Kconfig ? ? ? ? ? ? ? ?| ? ?3 ---
> ?arch/arm/plat-omap/include/plat/omap-pm.h | ? ?8 --------
> ?2 files changed, 0 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index cd5f993..16e3293 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -209,9 +209,6 @@ choice
> ? ? ? ?depends on ARCH_OMAP
> ? ? ? ?default OMAP_PM_NOOP
>
> -config OMAP_PM_NONE
> - ? ? ? bool "No PM layer"
> -
> ?config OMAP_PM_NOOP
> ? ? ? ?bool "No-op/debug PM layer"
>
> diff --git a/arch/arm/plat-omap/include/plat/omap-pm.h b/arch/arm/plat-omap/include/plat/omap-pm.h
> index c0a7520..0840df8 100644
> --- a/arch/arm/plat-omap/include/plat/omap-pm.h
> +++ b/arch/arm/plat-omap/include/plat/omap-pm.h
> @@ -40,11 +40,7 @@
> ?* framework starts. ?The "_if_" is to avoid name collisions with the
> ?* PM idle-loop code.
> ?*/
> -#ifdef CONFIG_OMAP_PM_NONE
> -#define omap_pm_if_early_init() 0
> -#else
> ?int __init omap_pm_if_early_init(void);
> -#endif
>
> ?/**
> ?* omap_pm_if_init - OMAP PM init code called after clock fw init
> @@ -52,11 +48,7 @@ int __init omap_pm_if_early_init(void);
> ?* The main initialization code. ?OPP tables are passed in here. ?The
> ?* "_if_" is to avoid name collisions with the PM idle-loop code.
> ?*/
> -#ifdef CONFIG_OMAP_PM_NONE
> -#define omap_pm_if_init() 0
> -#else
> ?int __init omap_pm_if_init(void);
> -#endif
>
> ?/**
> ?* omap_pm_if_exit - OMAP PM exit code
> --
> 1.7.1
>
>

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Paul Walmsley]

Salut Jean

On Fri, 6 May 2011, Jean Pihet wrote:

> The current code base is not linking with the OMAP_PM_NONE
> option set.
> Since the option OMAP_PM_NOOP provides a no-op/debug layer,
> OMAP_PM_NONE can be removed.
> OMAP_PM_NOOP is enabled by default by Kconfig.
> 
> Signed-off-by: Jean Pihet <j-pihet@ti.com>

I'm okay with this but could you please base it on v2.6.39-rc6 so I can 
merge it here?

thanks


- Paul

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Jean Pihet]

Hi Paul,

On Fri, May 6, 2011 at 6:16 PM, Paul Walmsley <paul@pwsan.com> wrote:
> Salut Jean
>
> On Fri, 6 May 2011, Jean Pihet wrote:
>
>> The current code base is not linking with the OMAP_PM_NONE
>> option set.
>> Since the option OMAP_PM_NOOP provides a no-op/debug layer,
>> OMAP_PM_NONE can be removed.
>> OMAP_PM_NOOP is enabled by default by Kconfig.
>>
>> Signed-off-by: Jean Pihet <j-pihet@ti.com>
>
> I'm okay with this but could you please base it on v2.6.39-rc6 so I can
> merge it here?
I checked the patch against the master branch of both Tony's and
Linus's trees, it applies and compiles OK.
Is that OK to you?

Regards,
Jean

>
> thanks
>
>
> - Paul
>

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Paul Walmsley]

On Fri, 6 May 2011, Jean Pihet wrote:

> I checked the patch against the master branch of both Tony's and
> Linus's trees, it applies and compiles OK.
> Is that OK to you?

If it applies cleanly against Linus's current tree, then yes, that's fine.


- Paul

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Jean Pihet]

Hi Paul,

> On Fri, 6 May 2011, Jean Pihet wrote:
>
>> I checked the patch against the master branch of both Tony's and
>> Linus's trees, it applies and compiles OK.
>> Is that OK to you?
>
> If it applies cleanly against Linus's current tree, then yes, that's fine.
Do you know what happened to this patch? Is it scheduled for merging
into mainline?

>
>
> - Paul
>

Thanks,
Jean

[RFC/PATCH] OMAP PM: remove OMAP_PM_NONE config option

[Paul Walmsley]

Hi Jean

On Mon, 20 Jun 2011, Jean Pihet wrote:

> > On Fri, 6 May 2011, Jean Pihet wrote:
> >
> >> I checked the patch against the master branch of both Tony's and
> >> Linus's trees, it applies and compiles OK.
> >> Is that OK to you?
> >
> > If it applies cleanly against Linus's current tree, then yes, that's fine.
> Do you know what happened to this patch? Is it scheduled for merging
> into mainline?

This patch has been queued for 3.1 at git://git.pwsan.com/linux-2.6 in the 
'omap_pm_cleanup_3.1' branch.

thanks,

- Paul