ARM: OMAP: Misc cosmetic clean-up for checkpatch.pl warnings

Misc cosmetic clean-up for checkpatch.pl warnings. Mostly to
make upstream patches not produce checkpatch errors.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h
index 918688efe6cf628f9f1d15fb12ecbe5e0e03a1d9..9d9d9bc9dc683c0efcbc119517c7e8b52e47ff5f 100644 (file)
--- a/arch/arm/mach-omap1/mmu.h
+++ b/arch/arm/mach-omap1/mmu.h
@@ -1,8 +1,8 @@
 #ifndef __MACH_OMAP1_MMU_H
 #define __MACH_OMAP1_MMU_H
 
+#include <linux/io.h>
 #include <asm/arch/mmu.h>
-#include <asm/io.h>
 
 #define MMU_LOCK_BASE_MASK             (0x3f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x3f << 4)

diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index f2bf91c7e4153ef91b315a9a4f33243013209bf1..aafa5471d4d0601f8b6c2e64afb75a00ca03da46 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-camera.c
+++ b/arch/arm/mach-omap2/board-n800-camera.c
@@ -357,7 +357,7 @@ void __init n800_cam_init(void)
        r = omap_request_gpio(N800_CAM_SENSOR_RESET_GPIO);
        if (r < 0) {
                printk(KERN_WARNING "%s: failed to request gpio\n",
-                       __FUNCTION__);
+                       __func__);
                return;
        }
 

diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index a5caf2cebbd6600f18940d09395a21230f773f1d..f890f2b2b2a05e780dd8cc2fd295eb7262842412 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -605,7 +605,7 @@ static struct prcm_config rate_table[] = {
  * Clock code will rewrite the register address as needed.
  */
 #define _CM_REG_OFFSET(module, reg)    ((void __iomem *)(module) + (reg))
-#define _GR_MOD_OFFSET(reg)    ((void __iomem*)(OMAP24XX_GR_MOD + (reg)))
+#define _GR_MOD_OFFSET(reg)    ((void __iomem *)(OMAP24XX_GR_MOD + (reg)))
 
 /*-------------------------------------------------------------------------
  * 24xx clock tree.

diff --git a/arch/arm/mach-omap2/mmu.c b/arch/arm/mach-omap2/mmu.c
index 66f5a3e2d46f03ad94f681976c9b6aa4704bf479..11718ce5afbc4765cc52c5adea8730de3e1df9c9 100644 (file)
--- a/arch/arm/mach-omap2/mmu.c
+++ b/arch/arm/mach-omap2/mmu.c
@@ -21,10 +21,10 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/io.h>
 #include "mmu.h"
 #include <asm/arch/mmu.h>
 #include <asm/tlbflush.h>
-#include <asm/io.h>
 #include <asm/sizes.h>
 
 static void *dspvect_page;

diff --git a/arch/arm/mach-omap2/mmu.h b/arch/arm/mach-omap2/mmu.h
index bae9db79a7dab4eef963490a05b91578fd46b69f..f45fcca0cf2abea7d9c7872f4476442370334bea 100644 (file)
--- a/arch/arm/mach-omap2/mmu.h
+++ b/arch/arm/mach-omap2/mmu.h
@@ -1,8 +1,8 @@
 #ifndef __MACH_OMAP2_MMU_H
 #define __MACH_OMAP2_MMU_H
 
+#include <linux/io.h>
 #include <asm/arch/mmu.h>
-#include <asm/io.h>
 
 #define MMU_LOCK_BASE_MASK             (0x1f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x1f << 4)

diff --git a/arch/arm/plat-omap/mmu.c b/arch/arm/plat-omap/mmu.c
index 988eedddb467a1e3eb97206a36669098e6aad9db..4b1ba8e99835a39342a1193d458dcb8bc6c346bc 100644 (file)
--- a/arch/arm/plat-omap/mmu.c
+++ b/arch/arm/plat-omap/mmu.c
@@ -22,8 +22,8 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/arch/mmu.h>
@@ -767,7 +767,7 @@ int omap_mmu_exmap(struct omap_mmu *mmu, unsigned long devadr,
            (devadr >= (1 << mmu->addrspace))) {
                dev_err(mmu->dev,
                        "MMU %s: illegal address/size for %s().\n",
-                       mmu->name, __FUNCTION__);
+                       mmu->name, __func__);
                return -EINVAL;
        }
 

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 0c4d860f247014488caf344b74a3b83f2f62c8ed..2699c16d4da05861365a53deb91aa0859d8ccc37 100644 (file)
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * arch/arm/plat-omap/usb.c -- platform level USB initialization
  *
  * Copyright (C) 2004 Texas Instruments, Inc.
@@ -193,9 +193,8 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 
                l = omap_readl(USB_TRANSCEIVER_CTRL);
                l &= ~(7 << 4);
-               if (!is_device) {
+               if (!is_device)
                        l |= (3 << 1);
-               }
                omap_writel(l, USB_TRANSCEIVER_CTRL);
 
                return 3 << 16;

diff --git a/include/asm-arm/arch-omap/board-apollon.h b/include/asm-arm/arch-omap/board-apollon.h
index 720335f0d7bbebacc7dd0f8b80eef89baa4a63da..3c4b7853655ab4c8167b9ef6bd823a415aa3e519 100644 (file)
--- a/include/asm-arm/arch-omap/board-apollon.h
+++ b/include/asm-arm/arch-omap/board-apollon.h
@@ -33,8 +33,8 @@ extern void apollon_mmc_init(void);
 
 static inline int apollon_plus(void)
 {
-        /* The apollon plus has IDCODE revision 5 */
-        return system_rev & 0xc0;
+       /* The apollon plus has IDCODE revision 5 */
+       return system_rev & 0xc0;
 }
 
 /* Placeholder for APOLLON specific defines */

diff --git a/include/asm-arm/arch-omap/mmu.h b/include/asm-arm/arch-omap/mmu.h
index efacb6f0fe8d6127bed9fef18bf5c8843e5bac3e..d970b71a4905cfbe6e964094145e13a0c7908343 100644 (file)
--- a/include/asm-arm/arch-omap/mmu.h
+++ b/include/asm-arm/arch-omap/mmu.h
@@ -129,7 +129,7 @@ struct omap_mmu {
        (likely(mmu->membase) && (((unsigned long)(addr) >= mmu->membase) &&    \
                 ((unsigned long)(addr) < mmu->membase + mmu->memsize)))
 
-#define INIT_EXMAP_TBL_ENTRY(ent,b,v,typ,od)   \
+#define INIT_EXMAP_TBL_ENTRY(ent, b, v, typ, od)       \
 do {                                           \
        (ent)->buf              = (b);          \
        (ent)->vadr             = (v);          \
@@ -142,7 +142,7 @@ do {                                                \
        (ent)->link.prev        = -1;           \
 } while (0)
 
-#define INIT_EXMAP_TBL_ENTRY_4KB_PRESERVED(ent,b,v)    \
+#define INIT_EXMAP_TBL_ENTRY_4KB_PRESERVED(ent, b, v)  \
 do {                                                   \
        (ent)->buf              = (b);                  \
        (ent)->vadr             = (v);                  \

diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index f216b4d8448a0a81317f61d6318073c2024b2274..ad39b0b61bff1a7abfa8d22026bdc22d722fceec 100644 (file)
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -166,7 +166,7 @@
 #define OMAP34XX_PIN_OFF_INPUT_PULLDOWN        (OMAP3_OFF_EN | OMAP3_OFF_PULL_EN)
 #define OMAP34XX_PIN_OFF_WAKEUPENABLE  OMAP3_WAKEUP_EN
 
-#define MUX_CFG_34XX(desc, reg_offset, mux_value){             \
+#define MUX_CFG_34XX(desc, reg_offset, mux_value) {            \
        .name           = desc,                                 \
        .debug          = 0,                                    \
        .mux_reg        = reg_offset,                           \