Skip to contentSkip to conversation

ARM: DRA7/AM43XX: fix header definition for omap44xx_restart

PATCH New Nishanth Menon 2 participants 2 messages May 16, 2014 – Jul 7, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Nishanth Menon

author
#0 lore raw

PATCH 1/1 ARM: DRA7/AM43XX: fix header definition for omap44xx_restart

omap44xx_restart is defined as a static void inline when DRA7/AM437X is defined alone, which implies that the restart function is no longer functional even though it is built in. So, fix the definition of the same.

Unfortunately, the number of SoCs starting to use omap44xx_restart is starting to grow and the definition looks a little ugly.

Signed-off-by Nishanth Menon <[email protected]>

---

based on v3.15-rc5

NOTE: this generates over 80 characters checkpatch warning.. I am not sure other than introducing a definition for restart it could be simplified.

 arch/arm/mach-omap2/common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/common.h +1 -1
index d88aff7..46150f4 100644
@@ -154,7 +154,7 @@ static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
 }
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
 void omap44xx_restart(enum reboot_mode mode, const char *cmd);
 #else
 static inline void omap44xx_restart(enum reboot_mode mode, const char *cmd)
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw

PATCH 1/1 ARM: DRA7/AM43XX: fix header definition for omap44xx_restart

Quoted 8 lines · Nishanth Menon

omap44xx_restart is defined as a static void inline when DRA7/AM437X is defined alone, which implies that the restart function is no longer functional even though it is built in. So, fix the definition of the same.

Unfortunately, the number of SoCs starting to use omap44xx_restart is starting to grow and the definition looks a little ugly.

Quoted 7 lines
Signed-off-by Nishanth Menon <[email protected]>

---

based on v3.15-rc5

NOTE: this generates over 80 characters checkpatch warning.. I am not sure other than introducing a definition for restart it could be simplified.

Sorry found this still pending so applying into omap-for-v3.16/fixes.

Regards,

Tony

Quoted 19 lines
 arch/arm/mach-omap2/common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/common.h +1 -1
index d88aff7..46150f4 100644
@@ -154,7 +154,7 @@ static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
 }
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
 void omap44xx_restart(enum reboot_mode mode, const char *cmd);
 #else
 static inline void omap44xx_restart(enum reboot_mode mode, const char *cmd)
Signature · 1 line
1.7.9.5