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>

5 files changed, 17 insertions, 20 deletions

diff --git a/arch/blackfin/mach-common/cplbinfo.c b/arch/blackfin/mach-common/cplbinfo.c
index caa9623e6bd..785ca981697 100644
--- a/arch/blackfin/mach-common/cplbinfo.c
+++ b/arch/blackfin/mach-common/cplbinfo.c
@@ -31,11 +31,10 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/uaccess.h>
 
 #include <asm/current.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
-
 #include <asm/cplb.h>
 #include <asm/blackfin.h>
 
@@ -92,8 +91,7 @@ static char *cplb_print_entry(char *buf, int type)
         } else
                 buf += sprintf(buf, "Data CPLB entry:\n");
 
-        buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\
-\tiCount\toCount\n");
+        buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\n\tiCount\toCount\n");
 
         while (*p_addr != 0xffffffff) {
                 entry = cplb_find_entry(cplb_addr, cplb_data, *p_addr, *p_data);
@@ -144,8 +142,7 @@ static int cplbinfo_proc_output(char *buf)
 
         p = buf;
 
-        p += sprintf(p,
-                     "------------------ CPLB Information ------------------\n\n");
+        p += sprintf(p, "------------------ CPLB Information ------------------\n\n");
 
         if (bfin_read_IMEM_CONTROL() & ENICPLB)
                 p = cplb_print_entry(p, CPLB_I);
@@ -191,9 +188,9 @@ static int __init cplbinfo_init(void)
 {
         struct proc_dir_entry *entry;
 
-        if ((entry = create_proc_entry("cplbinfo", 0, NULL)) == NULL) {
+        entry = create_proc_entry("cplbinfo", 0, NULL);
+        if (!entry)
                 return -ENOMEM;
-        }
 
         entry->read_proc = cplbinfo_read_proc;
         entry->write_proc = cplbinfo_write_proc;
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 15603275f74..fa4e6336317 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -49,8 +49,8 @@
 
 
 #include <linux/linkage.h>
+#include <linux/unistd.h>
 #include <asm/blackfin.h>
-#include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>  /* TIF_NEED_RESCHED */
 #include <asm/asm-offsets.h>
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index e6511db2403..ceb61d95d44 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -183,7 +183,7 @@ static void bf561_gpio_ack_irq(unsigned int irq)
 {
         u16 gpionr = irq - IRQ_PF0;
 
-        if(gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
+        if (gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
                 set_gpio_data(gpionr, 0);
                 SSYNC();
         }
@@ -193,7 +193,7 @@ static void bf561_gpio_mask_ack_irq(unsigned int irq)
 {
         u16 gpionr = irq - IRQ_PF0;
 
-        if(gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
+        if (gpio_edge_triggered[gpio_bank(gpionr)] & gpio_bit(gpionr)) {
                 set_gpio_data(gpionr, 0);
                 SSYNC();
         }
@@ -222,7 +222,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq)
         if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
                 ret = gpio_request(gpionr, NULL);
-                if(ret)
+                if (ret)
                         return ret;
 
         }
@@ -262,7 +262,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type)
                 if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
                         ret = gpio_request(gpionr, NULL);
-                        if(ret)
+                        if (ret)
                                 return ret;
 
                 }
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
index 27838da55d6..9f962f9df08 100644
--- a/arch/blackfin/mach-common/ints-priority-sc.c
+++ b/arch/blackfin/mach-common/ints-priority-sc.c
@@ -146,8 +146,8 @@ static void bfin_internal_mask_irq(unsigned int irq)
                              ~(1 << (irq - (IRQ_CORETMR + 1))));
 #else
         unsigned mask_bank, mask_bit;
-        mask_bank = (irq - (IRQ_CORETMR +1))/32;
-        mask_bit = (irq - (IRQ_CORETMR + 1))%32;
+        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
+        mask_bit = (irq - (IRQ_CORETMR + 1)) % 32;
         bfin_write_SIC_IMASK( mask_bank, bfin_read_SIC_IMASK(mask_bank) & \
                             ~(1 << mask_bit));
 #endif
@@ -161,7 +161,7 @@ static void bfin_internal_unmask_irq(unsigned int irq)
                              (1 << (irq - (IRQ_CORETMR + 1))));
 #else
         unsigned mask_bank, mask_bit;
-        mask_bank = (irq - (IRQ_CORETMR +1))/32;
+        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
         mask_bit = (irq - (IRQ_CORETMR + 1))%32;
         bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) | \
                         ( 1 << mask_bit));
@@ -439,7 +439,7 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
 {
         u16 i;
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=16) {
+        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += 16) {
                 int irq = IRQ_PF0 + i;
                 int flag_d = get_gpiop_data(i);
                 int mask =
@@ -590,7 +590,7 @@ void do_irq(int vec, struct pt_regs *fp)
                 sic_status[1] = bfin_read_SIC_ISR(1) & bfin_read_SIC_IMASK(1);
                 sic_status[2] = bfin_read_SIC_ISR(2) & bfin_read_SIC_IMASK(2);
                 SSYNC();
-                for(;; ivg++) {
+                for (;; ivg++) {
                         if (ivg >= ivg_stop) {
                                 atomic_inc(&num_spurious);
                                 return;
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 150ef5d088d..1772d8d2c1a 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -35,10 +35,10 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 
-#include <asm/io.h>
 #include <asm/dpmc.h>
-#include <asm/irq.h>
 #include <asm/gpio.h>
 
 #ifdef CONFIG_PM_WAKEUP_GPIO_POLAR_H