From 95b7cf930defdeb639c0b0d6220be738402c36c7 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 6 Jun 2008 15:42:30 -0700 Subject: [PATCH] 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 --- arch/arm/mach-omap1/mmu.h | 2 +- arch/arm/mach-omap2/board-n800-camera.c | 2 +- arch/arm/mach-omap2/clock24xx.h | 2 +- arch/arm/mach-omap2/mmu.c | 2 +- arch/arm/mach-omap2/mmu.h | 2 +- arch/arm/plat-omap/mmu.c | 6 +++--- arch/arm/plat-omap/usb.c | 5 ++--- include/asm-arm/arch-omap/board-apollon.h | 4 ++-- include/asm-arm/arch-omap/mmu.h | 4 ++-- include/asm-arm/arch-omap/mux.h | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h index 918688efe6c..9d9d9bc9dc6 100644 --- 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 #include -#include #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 f2bf91c7e41..aafa5471d4d 100644 --- 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 a5caf2cebbd..f890f2b2b2a 100644 --- 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 66f5a3e2d46..11718ce5afb 100644 --- a/arch/arm/mach-omap2/mmu.c +++ b/arch/arm/mach-omap2/mmu.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "mmu.h" #include #include -#include #include static void *dspvect_page; diff --git a/arch/arm/mach-omap2/mmu.h b/arch/arm/mach-omap2/mmu.h index bae9db79a7d..f45fcca0cf2 100644 --- 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 #include -#include #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 988eedddb46..4b1ba8e9983 100644 --- a/arch/arm/plat-omap/mmu.c +++ b/arch/arm/plat-omap/mmu.c @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -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 0c4d860f247..2699c16d4da 100644 --- 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 720335f0d7b..3c4b7853655 100644 --- 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 efacb6f0fe8..d970b71a490 100644 --- 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 f216b4d8448..ad39b0b61bf 100644 --- 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, \ -- 2.41.0