Skip to contentSkip to conversation

ARM: tegra: pm: fix build error w/o PM_SLEEP

PATCH New Stephen Warren 2 participants 2 messages Apr 15, 2013 – Apr 18, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: tegra: pm: fix build error w/o PM_SLEEP

From: Joseph Lo <[email protected]>

This fixes the building error when the PM_SLEEP is disabled. The fucntional defintion of "tegra_pm_validate_suspend_mode" without "static inline" would become a multiple definition error.

---
Arnd, Olof, can you please apply this to arm-soc too.

It probably should be applied wherever Tegra's for-3.10/soc branch was merged, since it fixes up code that was introduced in that branch. I have checked it applies cleanly to that Tegra branch, and doesn't cause any merge issues with at least other Tegra for-3.10 branches.

 arch/arm/mach-tegra/pm.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-tegra/pm.h +1 -1
index 9d2d038..778a4aa 100644
@@ -39,7 +39,7 @@ enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
 				enum tegra_suspend_mode mode);
 void tegra_init_suspend(void);
 #else
-enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
+static inline enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
 				enum tegra_suspend_mode mode)
 {
 	return TEGRA_SUSPEND_NONE;
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: tegra: pm: fix build error w/o PM_SLEEP

Quoted 11 lines · Stephen Warren

From: Joseph Lo <[email protected]>

This fixes the building error when the PM_SLEEP is disabled. The fucntional defintion of "tegra_pm_validate_suspend_mode" without "static inline" would become a multiple definition error.

---
Arnd, Olof, can you please apply this to arm-soc too.

Applied.

-Olof