All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM
@ 2011-03-13  3:37 ` Nishanth Menon
  0 siblings, 0 replies; 4+ messages in thread
From: Nishanth Menon @ 2011-03-13  3:37 UTC (permalink / raw)
  To: linux-omap; +Cc: Martin Etti, linux-arm, Tony, Kevin Hilman, Nishanth Menon

pm44xx.c is built only when CONFIG_PM is setup,
remove redundant CONFIG_PM check.

This also fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=25022

Reported-by: Martin Etti <ettl.martin@gmx.de>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm/mach-omap2/pm44xx.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 76cfff2..59a870b 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
 
 	pr_err("Power Management for TI OMAP4.\n");
 
-#ifdef CONFIG_PM
 	ret = pwrdm_for_each(pwrdms_setup, NULL);
 	if (ret) {
 		pr_err("Failed to setup powerdomains\n");
 		goto err2;
 	}
-#endif
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM
@ 2011-03-13  3:37 ` Nishanth Menon
  0 siblings, 0 replies; 4+ messages in thread
From: Nishanth Menon @ 2011-03-13  3:37 UTC (permalink / raw)
  To: linux-arm-kernel

pm44xx.c is built only when CONFIG_PM is setup,
remove redundant CONFIG_PM check.

This also fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=25022

Reported-by: Martin Etti <ettl.martin@gmx.de>

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm/mach-omap2/pm44xx.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 76cfff2..59a870b 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
 
 	pr_err("Power Management for TI OMAP4.\n");
 
-#ifdef CONFIG_PM
 	ret = pwrdm_for_each(pwrdms_setup, NULL);
 	if (ret) {
 		pr_err("Failed to setup powerdomains\n");
 		goto err2;
 	}
-#endif
 
 #ifdef CONFIG_SUSPEND
 	suspend_set_ops(&omap_pm_ops);
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM
  2011-03-13  3:37 ` Nishanth Menon
@ 2011-03-17 21:43   ` Kevin Hilman
  -1 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2011-03-17 21:43 UTC (permalink / raw)
  To: Nishanth Menon; +Cc: linux-omap, Martin Etti, linux-arm, Tony

Nishanth Menon <nm@ti.com> writes:

> pm44xx.c is built only when CONFIG_PM is setup,
> remove redundant CONFIG_PM check.
>
> This also fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=25022
>
> Reported-by: Martin Etti <ettl.martin@gmx.de>
>
> Signed-off-by: Nishanth Menon <nm@ti.com>

Thanks, queuing for 2.6.39-rc fixes cycle (branch: for_2.6.39/pm-fixes)

Kevin

> ---
>  arch/arm/mach-omap2/pm44xx.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
> index 76cfff2..59a870b 100644
> --- a/arch/arm/mach-omap2/pm44xx.c
> +++ b/arch/arm/mach-omap2/pm44xx.c
> @@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
>  
>  	pr_err("Power Management for TI OMAP4.\n");
>  
> -#ifdef CONFIG_PM
>  	ret = pwrdm_for_each(pwrdms_setup, NULL);
>  	if (ret) {
>  		pr_err("Failed to setup powerdomains\n");
>  		goto err2;
>  	}
> -#endif
>  
>  #ifdef CONFIG_SUSPEND
>  	suspend_set_ops(&omap_pm_ops);

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM
@ 2011-03-17 21:43   ` Kevin Hilman
  0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2011-03-17 21:43 UTC (permalink / raw)
  To: linux-arm-kernel

Nishanth Menon <nm@ti.com> writes:

> pm44xx.c is built only when CONFIG_PM is setup,
> remove redundant CONFIG_PM check.
>
> This also fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=25022
>
> Reported-by: Martin Etti <ettl.martin@gmx.de>
>
> Signed-off-by: Nishanth Menon <nm@ti.com>

Thanks, queuing for 2.6.39-rc fixes cycle (branch: for_2.6.39/pm-fixes)

Kevin

> ---
>  arch/arm/mach-omap2/pm44xx.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
> index 76cfff2..59a870b 100644
> --- a/arch/arm/mach-omap2/pm44xx.c
> +++ b/arch/arm/mach-omap2/pm44xx.c
> @@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
>  
>  	pr_err("Power Management for TI OMAP4.\n");
>  
> -#ifdef CONFIG_PM
>  	ret = pwrdm_for_each(pwrdms_setup, NULL);
>  	if (ret) {
>  		pr_err("Failed to setup powerdomains\n");
>  		goto err2;
>  	}
> -#endif
>  
>  #ifdef CONFIG_SUSPEND
>  	suspend_set_ops(&omap_pm_ops);

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-17 21:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-13  3:37 [PATCH] OMAP4: PM: remove redundant #ifdef CONFIG_PM Nishanth Menon
2011-03-13  3:37 ` Nishanth Menon
2011-03-17 21:43 ` Kevin Hilman
2011-03-17 21:43   ` Kevin Hilman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.