summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2009-06-01 18:02:00 +0300
committerWajahat Khan <w-khan@ti.com>2009-10-19 10:26:58 -0500
commit3c91816f6cf032a9ad2233f40b60d59dfb3a929b (patch)
tree8985e1682ac964e9d67f594c7a8822cf11c9bd41 /arch
parent4fcd1d03ec7206d80649c60ff699c26bb9e49435 (diff)
DSS2: Fix checkpatch complaints
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/vrfb.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c
index 59ac66a32094..0c7d943a3e14 100644
--- a/arch/arm/plat-omap/vrfb.c
+++ b/arch/arm/plat-omap/vrfb.c
@@ -1,9 +1,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ioport.h>
-
-#include <asm/io.h>
-#include <asm/bitops.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
#include <mach/io.h>
#include <mach/vrfb.h>
@@ -55,7 +54,7 @@ static struct {
u32 size;
} vrfb_hw_context[VRFB_NUM_CTXS];
-static void inline restore_hw_context(int ctx)
+static inline void restore_hw_context(int ctx)
{
omap_writel(vrfb_hw_context[ctx].control, SMS_ROT_CONTROL(ctx));
omap_writel(vrfb_hw_context[ctx].size, SMS_ROT_SIZE(ctx));
@@ -180,7 +179,7 @@ void omap_vrfb_release_ctx(struct vrfb *vrfb)
clear_bit(ctx, &ctx_map);
for (rot = 0; rot < 4; ++rot) {
- if(vrfb->paddr[rot]) {
+ if (vrfb->paddr[rot]) {
release_mem_region(vrfb->paddr[rot], OMAP_VRFB_SIZE);
vrfb->paddr[rot] = 0;
}