OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

PATCH In review Kevin Hilman 3 participants 10 messages Sep 1, 2011 – Sep 12, 2011

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Kevin Hilman

author

2011-09-01 18:11 UTC #0 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.

Reported-by Arnd Bergmann <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

---
Applies to v3.1-rc4.

 arch/arm/plat-omap/omap_device.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

arch/arm/plat-omap/omap_device.c +3 -0

index 9a6a538..02609ee 100644
@@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
 
 	return pm_generic_resume_noirq(dev);
 }
+#else
+#define _od_suspend_noirq NULL
+#define _od_resume_noirq NULL
 #endif
 
 static struct dev_pm_domain omap_device_pm_domain = {

Signature · 1 line

1.7.6

Arnd Bergmann

2011-09-01 18:22 UTC #1 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:

The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

Thansk for the fast response!

Rafael J. Wysocki

2011-09-01 21:55 UTC #2 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

Quoted 11 lines · Arnd Bergmann

Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
Acked-by Arnd Bergmann <[email protected]>
Thansk for the fast response!

I'll apply the patch when kernel.org is back in order.

Thanks,
Rafael

Kevin Hilman

author

2011-09-06 20:13 UTC #3 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

Quoted 6 lines · Rafael J. Wysocki

Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.

Quoted 9 lines

Quoted 6 lines
Quoted 2 lines
Reported-by Arnd Bergmann<[email protected]>
Signed-off-by Kevin Hilman<[email protected]>
Acked-by Arnd Bergmann<[email protected]>
Thansk for the fast response!
I'll apply the patch when kernel.org is back in order.

Tony,

I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc.

Thanks,

Kevin

Kevin Hilman

author

2011-09-06 20:20 UTC #4 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

Quoted 14 lines · Kevin Hilman

Quoted 13 lines · Rafael J. Wysocki
Quoted 11 lines · Arnd Bergmann
Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann<[email protected]>
Signed-off-by Kevin Hilman<[email protected]>
Acked-by Arnd Bergmann<[email protected]>
Thansk for the fast response!

Quoted 8 lines

Quoted 2 lines
I'll apply the patch when kernel.org is back in order.
Tony,
I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc.

For convenience, this patch is in a branch in my backup gitorious repo with Arnd's ack added:

	git://gitorious.org/khilman/linux-omap-pm.git for_3.1/pm-fixes-2

Kevin

Kevin Hilman

author

2011-09-12 17:44 UTC #5 lore raw

PATCH 1/1 OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

Arnd,

Quoted 20 lines · Kevin Hilman

Quoted 19 lines · Kevin Hilman
Quoted 6 lines · Rafael J. Wysocki
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Reported-by Arnd Bergmann<[email protected]>
Signed-off-by Kevin Hilman<[email protected]>
Acked-by Arnd Bergmann<[email protected]>
Thansk for the fast response!
I'll apply the patch when kernel.org is back in order.
Tony,

Quoted 9 lines

Quoted 3 lines
I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc.
For convenience, this patch is in a branch in my backup gitorious repo with Arnd's ack added:
git://gitorious.org/khilman/linux-omap-pm.git for_3.1/pm-fixes-2

Can you pick this up for v3.1-rc also?

Thanks,

Kevin

Kevin Hilman

author

2011-09-06 20:20 UTC #6 lore raw

In reply to Kevin Hilman

Quoted 14 lines · Kevin Hilman

Quoted 13 lines · Rafael J. Wysocki
Quoted 11 lines · Arnd Bergmann
Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann<[email protected]>
Signed-off-by Kevin Hilman<[email protected]>
Acked-by Arnd Bergmann<[email protected]>
Thansk for the fast response!

Quoted 8 lines

Quoted 2 lines
I'll apply the patch when kernel.org is back in order.
Tony,
I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc.

For convenience, this patch is in a branch in my backup gitorious repo with Arnd's ack added:

	git://gitorious.org/khilman/linux-omap-pm.git for_3.1/pm-fixes-2

Kevin

Kevin Hilman

author

2011-09-06 20:13 UTC #7 lore raw

In reply to Rafael J. Wysocki

Quoted 6 lines · Rafael J. Wysocki

Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.

Quoted 9 lines

Quoted 6 lines
Quoted 2 lines
Reported-by Arnd Bergmann<[email protected]>
Signed-off-by Kevin Hilman<[email protected]>
Acked-by Arnd Bergmann<[email protected]>
Thansk for the fast response!
I'll apply the patch when kernel.org is back in order.

Tony,

I spoke w/Rafael and due to hera being down and Rafael traveling to LPC he wont be able to queue this for v3.1. Can you queue up this fix? This needs to go in to v3.1-rc.

Thanks,

Kevin

Rafael J. Wysocki

2011-09-01 21:57 UTC #8 lore raw

In reply to Arnd Bergmann

Quoted 11 lines · Arnd Bergmann

Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:
The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
Acked-by Arnd Bergmann <[email protected]>
Thansk for the fast response!

I'll apply the patch when kernel.org is back in order.

Thanks,
Rafael

Arnd Bergmann

Acked-by on v1 1/1

2011-09-01 18:22 UTC #9 lore raw

In reply to Kevin Hilman

Quoted 6 lines · On Thursday 01 September 2011 11:12:02 Kevin Hilman wrote:

The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case.
Reported-by Arnd Bergmann <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

Thansk for the fast response!