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>

6 files changed, 31 insertions, 32 deletions

diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index edd31ce4f8d..4545f363e64 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -34,7 +34,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -51,11 +51,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -98,7 +98,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
                 .mode = SPI_MODE_3,
-        },{
+        }, {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
                 .bus_num = 1,               /* Framework bus number */
@@ -145,7 +145,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20200300,
                 .end = 0x20200300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF0,
                 .end = IRQ_PF0,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -194,11 +194,11 @@ static struct resource isp1362_hcd_resources[] = {
                 .start = 0x20308000,
                 .end = 0x20308000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20308004,
                 .end = 0x20308004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF4,
                 .end = IRQ_PF4,
                 .flags = IORESOURCE_IRQ,
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 0b522d95160..0000b8f1239 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -61,7 +61,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20310300,
                 .end = 0x20310300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF9,
                 .end = IRQ_PF9,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -85,11 +85,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
diff --git a/arch/blackfin/mach-bf533/boards/generic_board.c b/arch/blackfin/mach-bf533/boards/generic_board.c
index c0f43ccfbfb..9bc1f0d0ab5 100644
--- a/arch/blackfin/mach-bf533/boards/generic_board.c
+++ b/arch/blackfin/mach-bf533/boards/generic_board.c
@@ -30,7 +30,7 @@
 
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
@@ -53,11 +53,11 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20300300,
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PROG_INTB,
                 .end = IRQ_PROG_INTB,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                 /*
                  *  denotes the flag pin and is used directly if
                  *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 9a472fe1583..a9143c4cbdc 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -37,7 +37,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -62,7 +62,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20300300,
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -83,7 +83,7 @@ static struct resource net2272_bfin_resources[] = {
                 .start = 0x20300000,
                 .end = 0x20300000 + 0x100,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF10,
                 .end = IRQ_PF10,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -108,11 +108,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -229,19 +229,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 
 #if defined(CONFIG_PBX)
         {
-                .modalias       = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 3,
-                .controller_data= &spi_si3xxx_chip_info,
+                .modalias = "fxs-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 1,
+                .chip_select = 3,
+                .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
         {
-                .modalias       = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 2,
-                .controller_data= &spi_si3xxx_chip_info,
+                .modalias = "fxo-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 1,
+                .chip_select = 2,
+                .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
 #endif
diff --git a/arch/blackfin/mach-bf533/cpu.c b/arch/blackfin/mach-bf533/cpu.c
index 99547c4c290..6fd9cfd0a31 100644
--- a/arch/blackfin/mach-bf533/cpu.c
+++ b/arch/blackfin/mach-bf533/cpu.c
@@ -79,8 +79,7 @@ static int bf533_target(struct cpufreq_policy *policy,
         int i;
 
         struct cpufreq_freqs freqs;
-        if (cpufreq_frequency_table_target
-            (policy, bf533_freq_table, target_freq, relation, &index))
+        if (cpufreq_frequency_table_target(policy, bf533_freq_table, target_freq, relation, &index))
                 return -EINVAL;
         cclk_mhz = bf533_freq_table[index].frequency;
         vco_mhz = bf533_freq_table[index].index;
diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c
index a3e1789167b..7d79e0f9503 100644
--- a/arch/blackfin/mach-bf533/ints-priority.c
+++ b/arch/blackfin/mach-bf533/ints-priority.c
@@ -28,8 +28,8 @@
  */
 
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/blackfin.h>
-#include <asm/irq.h>
 
 void program_IAR(void)
 {