summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Vial <jvial@adeneo-embedded.com>2014-07-31 15:10:34 +0200
committerTony Lindgren <tony@atomide.com>2014-08-01 10:21:14 +0200
commitae21e6180a03c147514c606b4e649690e0cbd40e (patch)
tree6914d5e3c9b1d0de334fc1893e9fc19c4bbb212f
parentARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case. (diff)
downloadlinux-ae21e6180a03c147514c606b4e649690e0cbd40e.tar.xz
linux-ae21e6180a03c147514c606b4e649690e0cbd40e.zip
ARM: OMAP3: Fix coding style problems in arch/arm/mach-omap2/control.c
Fix coding style problems in arch/arm/mach-omap2/control.c. Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/control.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index e84e3b4bfde1..da041b4ab29c 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -280,6 +280,7 @@ void omap3_clear_scratchpad_contents(void)
u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
void __iomem *v_addr;
u32 offset = 0;
+
v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
if (omap3xxx_prm_clear_global_cold_reset()) {
for ( ; offset <= max_offset; offset += 0x4)
@@ -464,7 +465,6 @@ void omap3_control_save_context(void)
control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
control_context.padconf_sys_nirq =
omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3_control_restore_context(void)
@@ -522,7 +522,6 @@ void omap3_control_restore_context(void)
omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
omap_ctrl_writel(control_context.padconf_sys_nirq,
OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3630_ctrl_disable_rta(void)