Blackfin arch: cleanup warnings from checkpatch -- no functional changes

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

17 files changed, 142 insertions, 154 deletions

diff --git a/arch/blackfin/kernel/asm-offsets.c b/arch/blackfin/kernel/asm-offsets.c
index e455f4504509..b56b2741cdea 100644
--- a/arch/blackfin/kernel/asm-offsets.c
+++ b/arch/blackfin/kernel/asm-offsets.c
@@ -32,11 +32,10 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
-#include <asm/irq.h>
-#include <asm/thread_info.h>
+#include <linux/irq.h>
+#include <linux/thread_info.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
 
 int main(void)
 {
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 8a16c2bbec04..7cf02f02a1db 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -332,7 +332,7 @@ set_bfin_dma_config(char direction, char flow_mode,
 }
 EXPORT_SYMBOL(set_bfin_dma_config);
 
-void set_dma_sg(unsigned int channel, struct dmasg * sg, int nr_sg)
+void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg)
 {
         BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
                && channel < MAX_BLACKFIN_DMA_CHANNEL));
@@ -401,7 +401,7 @@ static void *__dma_memcpy(void *dest, const void *src, size_t size)
 
         if (size <= 0)
                 return NULL;
-        
+
         local_irq_save(flags);
 
         if ((unsigned long)src < memory_end)
@@ -545,7 +545,6 @@ void *dma_memcpy(void *dest, const void *src, size_t size)
         addr = __dma_memcpy(dest+bulk, src+bulk, rest);
         return addr;
 }
-
 EXPORT_SYMBOL(dma_memcpy);
 
 void *safe_dma_memcpy(void *dest, const void *src, size_t size)
@@ -558,14 +557,13 @@ EXPORT_SYMBOL(safe_dma_memcpy);
 
 void dma_outsb(void __iomem *addr, const void *buf, unsigned short len)
 {
-
         unsigned long flags;
-        
+
         local_irq_save(flags);
-        
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
 
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+
+        bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(0);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -593,9 +591,9 @@ EXPORT_SYMBOL(dma_outsb);
 void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
 {
         unsigned long flags;
-                
+
         local_irq_save(flags);
-        bfin_write_MDMA_D0_START_ADDR(buf);
+        bfin_write_MDMA_D0_START_ADDR(buf);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(1);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -624,12 +622,12 @@ EXPORT_SYMBOL(dma_insb);
 void dma_outsw(void __iomem *addr, const void  *buf, unsigned short len)
 {
         unsigned long flags;
-        
+
         local_irq_save(flags);
-                
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
 
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+
+        bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(0);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -656,10 +654,10 @@ EXPORT_SYMBOL(dma_outsw);
 void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
 {
         unsigned long flags;
-                
+
         local_irq_save(flags);
-        
-        bfin_write_MDMA_D0_START_ADDR(buf);
+
+        bfin_write_MDMA_D0_START_ADDR(buf);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(2);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -688,12 +686,12 @@ EXPORT_SYMBOL(dma_insw);
 void dma_outsl(void __iomem *addr, const void *buf, unsigned short len)
 {
         unsigned long flags;
-        
+
         local_irq_save(flags);
-        
-        blackfin_dcache_flush_range((unsigned int)buf,(unsigned int)(buf) + len);
 
-        bfin_write_MDMA_D0_START_ADDR(addr);
+        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+
+        bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(0);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -720,10 +718,10 @@ EXPORT_SYMBOL(dma_outsl);
 void dma_insl(const void __iomem *addr, void *buf, unsigned short len)
 {
         unsigned long flags;
-        
+
         local_irq_save(flags);
-        
-        bfin_write_MDMA_D0_START_ADDR(buf);
+
+        bfin_write_MDMA_D0_START_ADDR(buf);
         bfin_write_MDMA_D0_X_COUNT(len);
         bfin_write_MDMA_D0_X_MODIFY(4);
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index bb1f4fb2467c..bafcfa52142b 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -162,7 +162,7 @@ static void port_setup(unsigned short gpio, unsigned short usage)
 
 static void default_gpio(unsigned short gpio)
 {
-        unsigned short bank,bitmask;
+        unsigned short bank, bitmask;
 
         bank = gpio_bank(gpio);
         bitmask = gpio_bit(gpio);
@@ -183,7 +183,7 @@ static int __init bfin_gpio_init(void)
 
         printk(KERN_INFO "Blackfin GPIO Controller\n");
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE)
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE)
                 reserved_map[gpio_bank(i)] = 0;
 
 #if defined(BF537_FAMILY) && (defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
@@ -478,7 +478,7 @@ u32 gpio_pm_setup(void)
         u32 sic_iwr = 0;
         u16 bank, mask, i, gpio;
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
                 mask = wakeup_map[gpio_bank(i)];
                 bank = gpio_bank(i);
 
@@ -522,12 +522,11 @@ u32 gpio_pm_setup(void)
                 return IWR_ENABLE_ALL;
 }
 
-
 void gpio_pm_restore(void)
 {
         u16 bank, mask, i;
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
                 mask = wakeup_map[gpio_bank(i)];
                 bank = gpio_bank(i);
 
@@ -591,7 +590,6 @@ int gpio_request(unsigned short gpio, const char *label)
 }
 EXPORT_SYMBOL(gpio_request);
 
-
 void gpio_free(unsigned short gpio)
 {
         unsigned long flags;
@@ -616,7 +614,6 @@ void gpio_free(unsigned short gpio)
 }
 EXPORT_SYMBOL(gpio_free);
 
-
 void gpio_direction_input(unsigned short gpio)
 {
         unsigned long flags;
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index f64ecb638fab..70455949cfd2 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -28,10 +28,11 @@
  */
 
 #include <linux/module.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
+#include <linux/uaccess.h>
+
 #include <asm/checksum.h>
 #include <asm/cacheflush.h>
-#include <asm/uaccess.h>
 
 /* platform dependent support */
 
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c
index 539eb24e062f..bda57ec88151 100644
--- a/arch/blackfin/kernel/dma-mapping.c
+++ b/arch/blackfin/kernel/dma-mapping.c
@@ -34,8 +34,8 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/io.h>
 #include <asm/cacheflush.h>
-#include <asm/io.h>
 #include <asm/bfin-global.h>
 
 static spinlock_t dma_page_lock;
diff --git a/arch/blackfin/kernel/dualcore_test.c b/arch/blackfin/kernel/dualcore_test.c
index 8b89c99f9dfa..0fcba74840b7 100644
--- a/arch/blackfin/kernel/dualcore_test.c
+++ b/arch/blackfin/kernel/dualcore_test.c
@@ -30,19 +30,19 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
-static int *testarg = (int*)0xfeb00000;
+static int *testarg = (int *)0xfeb00000;
 
 static int test_init(void)
 {
         *testarg = 1;
-        printk("Dual core test module inserted: set testarg = [%d]\n @ [%p]\n",
+        printk(KERN_INFO "Dual core test module inserted: set testarg = [%d]\n @ [%p]\n",
                *testarg, testarg);
         return 0;
 }
 
 static void test_exit(void)
 {
-        printk("Dual core test module removed: testarg = [%d]\n", *testarg);
+        printk(KERN_INFO "Dual core test module removed: testarg = [%d]\n", *testarg);
 }
 
 module_init(test_init);
diff --git a/arch/blackfin/kernel/fixed_code.S b/arch/blackfin/kernel/fixed_code.S
index 99ea296c82c7..d8b1ebc70996 100644
--- a/arch/blackfin/kernel/fixed_code.S
+++ b/arch/blackfin/kernel/fixed_code.S
@@ -8,8 +8,8 @@
  * BF561 SMP).
  */
 #include <linux/linkage.h>
+#include <linux/unistd.h>
 #include <asm/entry.h>
-#include <asm/unistd.h>
 
 .text
 ENTRY(_fixed_code_start)
diff --git a/arch/blackfin/kernel/flat.c b/arch/blackfin/kernel/flat.c
index a92587b628b5..d188b2430536 100644
--- a/arch/blackfin/kernel/flat.c
+++ b/arch/blackfin/kernel/flat.c
@@ -36,24 +36,22 @@ unsigned long bfin_get_addr_from_rp(unsigned long *ptr,
         unsigned long val;
 
         switch (type) {
-                case FLAT_BFIN_RELOC_TYPE_16_BIT:
-                case FLAT_BFIN_RELOC_TYPE_16H_BIT:
-                        usptr = (unsigned short *)ptr;
-                        pr_debug("*usptr = %x", get_unaligned(usptr));
-                        val = get_unaligned(usptr);
-                        val += *persistent;
-                        break;
+        case FLAT_BFIN_RELOC_TYPE_16_BIT:
+        case FLAT_BFIN_RELOC_TYPE_16H_BIT:
+                usptr = (unsigned short *)ptr;
+                pr_debug("*usptr = %x", get_unaligned(usptr));
+                val = get_unaligned(usptr);
+                val += *persistent;
+                break;
 
-                case FLAT_BFIN_RELOC_TYPE_32_BIT:
-                        pr_debug("*ptr = %lx", get_unaligned(ptr));
-                        val = get_unaligned(ptr);
-                        break;
+        case FLAT_BFIN_RELOC_TYPE_32_BIT:
+                pr_debug("*ptr = %lx", get_unaligned(ptr));
+                val = get_unaligned(ptr);
+                break;
 
-                default:
-                        pr_debug("BINFMT_FLAT: Unknown relocation type %x\n",
-                                type);
-
-                        return 0;
+        default:
+                pr_debug("BINFMT_FLAT: Unknown relocation type %x\n", type);
+                return 0;
         }
 
         /*
@@ -81,21 +79,20 @@ void bfin_put_addr_at_rp(unsigned long *ptr, unsigned long addr,
         int type = (relval >> 26) & 7;
 
         switch (type) {
-                case FLAT_BFIN_RELOC_TYPE_16_BIT:
-                        put_unaligned(addr, usptr);
-                        pr_debug("new value %x at %p", get_unaligned(usptr),
-                                usptr);
-                        break;
+        case FLAT_BFIN_RELOC_TYPE_16_BIT:
+                put_unaligned(addr, usptr);
+                pr_debug("new value %x at %p", get_unaligned(usptr), usptr);
+                break;
 
-                case FLAT_BFIN_RELOC_TYPE_16H_BIT:
-                        put_unaligned(addr >> 16, usptr);
-                        pr_debug("new value %x", get_unaligned(usptr));
-                        break;
+        case FLAT_BFIN_RELOC_TYPE_16H_BIT:
+                put_unaligned(addr >> 16, usptr);
+                pr_debug("new value %x", get_unaligned(usptr));
+                break;
 
-                case FLAT_BFIN_RELOC_TYPE_32_BIT:
-                        put_unaligned(addr, ptr);
-                        pr_debug("new ptr =%lx", get_unaligned(ptr));
-                        break;
+        case FLAT_BFIN_RELOC_TYPE_32_BIT:
+                put_unaligned(addr, ptr);
+                pr_debug("new ptr =%lx", get_unaligned(ptr));
+                break;
         }
 }
 EXPORT_SYMBOL(bfin_put_addr_at_rp);
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 80996a1a94ca..1fc001c7abda 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -82,7 +82,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         seq_printf(p, ", %s", action->name);
 
                 seq_putc(p, '\n');
-              unlock:
+ unlock:
                 spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "Err: %10lu\n", irq_err_count);
diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index 372f756f1ad9..8b9fe29d03f4 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -165,8 +165,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
 
         for (s = sechdrs; s < sechdrs_end; ++s) {
                 if ((strcmp(".l1.text", secstrings + s->sh_name) == 0) ||
-                        ((strcmp(".text", secstrings + s->sh_name)==0) &&
-                         (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) {
+                    ((strcmp(".text", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) {
                         mod->arch.text_l1 = s;
                         dest = l1_inst_sram_alloc(s->sh_size);
                         if (dest == NULL) {
@@ -179,9 +179,9 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                         s->sh_flags &= ~SHF_ALLOC;
                         s->sh_addr = (unsigned long)dest;
                 }
-                if ((strcmp(".l1.data", secstrings + s->sh_name) == 0)||
-                        ((strcmp(".data", secstrings + s->sh_name)==0) &&
-                         (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                if ((strcmp(".l1.data", secstrings + s->sh_name) == 0) ||
+                    ((strcmp(".data", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
                         mod->arch.data_a_l1 = s;
                         dest = l1_data_sram_alloc(s->sh_size);
                         if (dest == NULL) {
@@ -195,8 +195,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                         s->sh_addr = (unsigned long)dest;
                 }
                 if (strcmp(".l1.bss", secstrings + s->sh_name) == 0 ||
-                        ((strcmp(".bss", secstrings + s->sh_name)==0) &&
-                         (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                    ((strcmp(".bss", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
                         mod->arch.bss_a_l1 = s;
                         dest = l1_data_sram_alloc(s->sh_size);
                         if (dest == NULL) {
@@ -326,7 +326,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                         pr_debug("before %x after %x\n", *location16,
                                        (value & 0xffff));
                         tmp = (value & 0xffff);
-                        if((unsigned long)location16 >= L1_CODE_START) {
+                        if ((unsigned long)location16 >= L1_CODE_START) {
                                 dma_memcpy(location16, &tmp, 2);
                         } else
                                 *location16 = tmp;
@@ -335,7 +335,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
                         pr_debug("before %x after %x\n", *location16,
                                        ((value >> 16) & 0xffff));
                         tmp = ((value >> 16) & 0xffff);
-                        if((unsigned long)location16 >= L1_CODE_START) {
+                        if ((unsigned long)location16 >= L1_CODE_START) {
                                 dma_memcpy(location16, &tmp, 2);
                         } else
                                 *location16 = tmp;
@@ -404,8 +404,8 @@ module_finalize(const Elf_Ehdr * hdr,
                         continue;
 
                 if ((sechdrs[i].sh_type == SHT_RELA) &&
-                    ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0)||
-                        ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
+                    ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) ||
+                    ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
                          (hdr->e_flags & FLG_CODE_IN_L1)))) {
                         apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
                                            symindex, i, mod);
@@ -417,13 +417,13 @@ module_finalize(const Elf_Ehdr * hdr,
 void module_arch_cleanup(struct module *mod)
 {
         if ((mod->arch.text_l1) && (mod->arch.text_l1->sh_addr))
-                l1_inst_sram_free((void*)mod->arch.text_l1->sh_addr);
+                l1_inst_sram_free((void *)mod->arch.text_l1->sh_addr);
         if ((mod->arch.data_a_l1) && (mod->arch.data_a_l1->sh_addr))
-                l1_data_sram_free((void*)mod->arch.data_a_l1->sh_addr);
+                l1_data_sram_free((void *)mod->arch.data_a_l1->sh_addr);
         if ((mod->arch.bss_a_l1) && (mod->arch.bss_a_l1->sh_addr))
-                l1_data_sram_free((void*)mod->arch.bss_a_l1->sh_addr);
+                l1_data_sram_free((void *)mod->arch.bss_a_l1->sh_addr);
         if ((mod->arch.data_b_l1) && (mod->arch.data_b_l1->sh_addr))
-                l1_data_B_sram_free((void*)mod->arch.data_b_l1->sh_addr);
+                l1_data_B_sram_free((void *)mod->arch.data_b_l1->sh_addr);
         if ((mod->arch.bss_b_l1) && (mod->arch.bss_b_l1->sh_addr))
-                l1_data_B_sram_free((void*)mod->arch.bss_b_l1->sh_addr);
+                l1_data_B_sram_free((void *)mod->arch.bss_b_l1->sh_addr);
 }
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 6b7a94ab96c2..5a51dd6ab280 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -32,9 +32,9 @@
 #include <linux/unistd.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
+#include <linux/uaccess.h>
 
 #include <asm/blackfin.h>
-#include <asm/uaccess.h>
 #include <asm/fixed_code.h>
 
 #define LED_ON  0
@@ -174,8 +174,8 @@ void show_regs(struct pt_regs *regs)
         printk(KERN_NOTICE "R4: %08lx  R5: %08lx  R6: %08lx  R7: %08lx\n",
                regs->r4, regs->r5, regs->r6, regs->r7);
 
-        if (!(regs->ipend))
-                printk("USP: %08lx\n", rdusp());
+        if (!regs->ipend)
+                printk(KERN_NOTICE "USP: %08lx\n", rdusp());
 }
 
 /* Fill in the fpu structure for a core dump.  */
@@ -323,7 +323,7 @@ asmlinkage int sys_execve(char *name, char **argv, char **envp)
                 goto out;
         error = do_execve(filename, argv, envp, regs);
         putname(filename);
-      out:
+ out:
         unlock_kernel();
         return error;
 }
@@ -421,7 +421,7 @@ int _access_ok(unsigned long addr, unsigned long size)
 
         if (addr > (addr + size))
                 return 0;
-        if (segment_eq(get_fs(),KERNEL_DS))
+        if (segment_eq(get_fs(), KERNEL_DS))
                 return 1;
 #ifdef CONFIG_MTD_UCLINUX
         if (addr >= memory_start && (addr + size) <= memory_end)
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index e718bb4a1ef0..ed800c7456dd 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -36,8 +36,8 @@
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/signal.h>
+#include <linux/uaccess.h>
 
-#include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -122,7 +122,7 @@ static inline long get_reg(struct task_struct *task, int regno)
 static inline int
 put_reg(struct task_struct *task, int regno, unsigned long data)
 {
-        char * reg_ptr;
+        char *reg_ptr;
 
         struct pt_regs *regs =
             (struct pt_regs *)((unsigned long)task_stack_page(task) +
@@ -146,7 +146,7 @@ put_reg(struct task_struct *task, int regno, unsigned long data)
                 break;
         default:
                 if (regno <= 216)
-                        *(long *)(reg_ptr + regno) = data;
+                        *(long *)(reg_ptr + regno) = data;
         }
         return 0;
 }
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index a86bf6545781..3309238890ae 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -362,15 +362,15 @@ void __init setup_arch(char **cmdline_p)
                , _stext, _etext,
                __start_rodata, __end_rodata,
                _sdata, _edata,
-               (void*)&init_thread_union, (void*)((int)(&init_thread_union) + 0x2000),
+               (void *)&init_thread_union, (void *)((int)(&init_thread_union) + 0x2000),
                __init_begin, __init_end,
                __bss_start, __bss_stop,
-               (void*)_ramstart, (void*)memory_end
+               (void *)_ramstart, (void *)memory_end
 #ifdef CONFIG_MTD_UCLINUX
-               , (void*)memory_mtd_start, (void*)(memory_mtd_start + mtd_size)
+               , (void *)memory_mtd_start, (void *)(memory_mtd_start + mtd_size)
 #endif
 #if DMA_UNCACHED_REGION > 0
-               , (void*)(_ramend - DMA_UNCACHED_REGION), (void*)(_ramend)
+               , (void *)(_ramend - DMA_UNCACHED_REGION), (void *)(_ramend)
 #endif
                );
 
@@ -476,7 +476,6 @@ u_long get_cclk(void)
                 return get_vco() / ssel;
         return get_vco() >> csel;
 }
-
 EXPORT_SYMBOL(get_cclk);
 
 /* Get the System clock */
@@ -495,7 +494,6 @@ u_long get_sclk(void)
 
         return get_vco() / ssel;
 }
-
 EXPORT_SYMBOL(get_sclk);
 
 /*
@@ -550,23 +548,23 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "D-CACHE:\tOFF\n");
 
 
-        switch(bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
-                case ACACHE_BSRAM:
-                        seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n");
-                        dcache_size = 16;
-                        dsup_banks = 1;
-                        break;
-                case ACACHE_BCACHE:
-                        seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n");
-                        dcache_size = 32;
-                        dsup_banks = 2;
-                        break;
-                case ASRAM_BSRAM:
-                        seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n");
-                        dcache_size = 0;
-                        dsup_banks = 0;
-                        break;
-                default:
+        switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
+        case ACACHE_BSRAM:
+                seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n");
+                dcache_size = 16;
+                dsup_banks = 1;
+                break;
+        case ACACHE_BCACHE:
+                seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n");
+                dcache_size = 32;
+                dsup_banks = 2;
+                break;
+        case ASRAM_BSRAM:
+                seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n");
+                dcache_size = 0;
+                dsup_banks = 0;
+                break;
+        default:
                 break;
         }
 
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index 316e65c3439d..5564c9588aa8 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -34,8 +34,8 @@
 #include <linux/personality.h>
 #include <linux/binfmts.h>
 #include <linux/freezer.h>
+#include <linux/uaccess.h>
 
-#include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
 
@@ -124,7 +124,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused)
 
         return r0;
 
-      badframe:
+ badframe:
         force_sig(SIGSEGV, current);
         return 0;
 }
@@ -239,7 +239,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
 
         return 0;
 
-      give_sigsegv:
+ give_sigsegv:
         if (sig == SIGSEGV)
                 ka->sa.sa_handler = SIG_DFL;
         force_sig(SIGSEGV, current);
@@ -263,7 +263,7 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
                 }
                 /* fallthrough */
         case -ERESTARTNOINTR:
-              do_restart:
+ do_restart:
                 regs->p0 = regs->orig_p0;
                 regs->r0 = regs->orig_r0;
                 regs->pc -= 2;
@@ -341,7 +341,7 @@ asmlinkage void do_signal(struct pt_regs *regs)
                 return;
         }
 
-no_signal:
+ no_signal:
         /* Did we come from a system call? */
         if (regs->orig_p0 >= 0)
                 /* Restart the system call - no handlers present */
diff --git a/arch/blackfin/kernel/sys_bfin.c b/arch/blackfin/kernel/sys_bfin.c
index f436e6743f5a..f5e1ae3d1705 100644
--- a/arch/blackfin/kernel/sys_bfin.c
+++ b/arch/blackfin/kernel/sys_bfin.c
@@ -37,12 +37,12 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
+#include <linux/uaccess.h>
+#include <linux/ipc.h>
+#include <linux/unistd.h>
 
 #include <asm/cacheflush.h>
-#include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/dma.h>
-#include <asm/unistd.h>
 
 /*
  * sys_pipe() is the normal C calling standard for creating
@@ -83,7 +83,7 @@ do_mmap2(unsigned long addr, unsigned long len,
 
         if (file)
                 fput(file);
-      out:
+ out:
         return error;
 }
 
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c
index f578176b6d92..beef057bd1dc 100644
--- a/arch/blackfin/kernel/time.c
+++ b/arch/blackfin/kernel/time.c
@@ -87,7 +87,7 @@ void __init init_leds(void)
 static inline void do_leds(void)
 {
         static unsigned int count = 50;
-        static int flag = 0;
+        static int flag;
         unsigned short tmp = 0;
 
         if (--count == 0) {
@@ -200,7 +200,7 @@ irqreturn_t timer_interrupt(int irq, void *dummy)__attribute__((l1_text));
 irqreturn_t timer_interrupt(int irq, void *dummy)
 {
         /* last time the cmos clock got updated */
-        static long last_rtc_update = 0;
+        static long last_rtc_update;
 
         write_seqlock(&xtime_lock);
 
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index a58d0f50be20..114277bb46f8 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -27,16 +27,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
 #include <asm/traps.h>
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
-#include <asm/uaccess.h>
 #include <asm/irq_handler.h>
 #include <asm/trace.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
 
 #ifdef CONFIG_KGDB
 # include <linux/debugger.h>
@@ -77,7 +76,7 @@ static int printk_address(unsigned long address)
                 if (!modname)
                         modname = delim = "";
                 return printk("<0x%p> { %s%s%s%s + 0x%lx }",
-                              (void*)address, delim, modname, delim, symname,
+                              (void *)address, delim, modname, delim, symname,
                               (unsigned long)offset);
 
         }
@@ -120,7 +119,7 @@ static int printk_address(unsigned long address)
 
                                 write_unlock_irq(&tasklist_lock);
                                 return printk("<0x%p> [ %s + 0x%lx ]",
-                                              (void*)address, name, offset);
+                                              (void *)address, name, offset);
                         }
 
                         vml = vml->next;
@@ -129,7 +128,7 @@ static int printk_address(unsigned long address)
         write_unlock_irq(&tasklist_lock);
 
         /* we were unable to find this address anywhere */
-        return printk("[<0x%p>]", (void*)address);
+        return printk("[<0x%p>]", (void *)address);
 }
 
 asmlinkage void trap_c(struct pt_regs *fp)
@@ -538,29 +537,28 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
                 printk(KERN_EMERG "TEXT = 0x%p-0x%p  DATA = 0x%p-0x%p\n"
                        KERN_EMERG "BSS = 0x%p-0x%p   USER-STACK = 0x%p\n"
                        KERN_EMERG "\n",
-                       (void*)current->mm->start_code,
-                       (void*)current->mm->end_code,
-                       (void*)current->mm->start_data,
-                       (void*)current->mm->end_data,
-                       (void*)current->mm->end_data,
-                       (void*)current->mm->brk,
-                       (void*)current->mm->start_stack);
+                       (void *)current->mm->start_code,
+                       (void *)current->mm->end_code,
+                       (void *)current->mm->start_data,
+                       (void *)current->mm->end_data,
+                       (void *)current->mm->end_data,
+                       (void *)current->mm->brk,
+                       (void *)current->mm->start_stack);
         }
 
         printk(KERN_EMERG "return address: [0x%p]; contents of:", retaddr);
-        if (retaddr != 0 && retaddr <= (void*)physical_mem_end
+        if (retaddr != 0 && retaddr <= (void *)physical_mem_end
 #if L1_CODE_LENGTH != 0
             /* FIXME: Copy the code out of L1 Instruction SRAM through dma
                memcpy.  */
-            && !(retaddr >= (void*)L1_CODE_START
-                 && retaddr < (void*)(L1_CODE_START + L1_CODE_LENGTH))
+            && !(retaddr >= (void *)L1_CODE_START
+                 && retaddr < (void *)(L1_CODE_START + L1_CODE_LENGTH))
 #endif
         ) {
                 int i = ((unsigned int)retaddr & 0xFFFFFFF0) - 32;
                 unsigned short x = 0;
-                for (; i < ((unsigned int)retaddr & 0xFFFFFFF0 ) + 32 ;
-                        i += 2) {
-                        if ( !(i & 0xF) )
+                for (; i < ((unsigned int)retaddr & 0xFFFFFFF0) + 32; i += 2) {
+                        if (!(i & 0xF))
                                 printk(KERN_EMERG "\n" KERN_EMERG
                                         "0x%08x: ", i);
 
@@ -579,7 +577,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
                                         " The rest of this error"
                                         " is meanless\n");
 #endif
-                        if ( i == (unsigned int)retaddr )
+                        if (i == (unsigned int)retaddr)
                                 printk("[%04x]", x);
                         else
                                 printk(" %04x ", x);
@@ -672,8 +670,8 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
                 break;
         }
 
-        printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void*)bfin_read_DCPLB_FAULT_ADDR());
-        printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void*)bfin_read_ICPLB_FAULT_ADDR());
+        printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void *)bfin_read_DCPLB_FAULT_ADDR());
+        printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void *)bfin_read_ICPLB_FAULT_ADDR());
         dump_bfin_regs(fp, (void *)fp->retx);
         dump_stack();
         panic("Unrecoverable event\n");