ARM: Fix few more trailing commas Fix few more trailing commas Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c index 6ca5a3b..90ff538 100644 --- a/arch/arm/kernel/kgdb.c +++ b/arch/arm/kernel/kgdb.c
@@ -248,8 +248,8 @@ */ struct kgdb_arch arch_kgdb_ops = { #ifndef __ARMEB__ - .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} + .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}, #else /* ! __ARMEB__ */ - .gdb_bpt_instr = {0xe7, 0xff, 0xde, 0xfe} + .gdb_bpt_instr = {0xe7, 0xff, 0xde, 0xfe}, #endif };
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c index 8368c3e56..785560f 100644 --- a/arch/arm/kernel/kprobes-test.c +++ b/arch/arm/kernel/kprobes-test.c
@@ -564,7 +564,7 @@ if (ret < 0) { pr_err("FAIL: register_kprobe failed with %d\n", ret); return ret; - } + }, ret = benchmark(fn);
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index 62dfe3a..1b82d18 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -97,7 +97,7 @@ .chip_select = 0, .max_speed_hz = 1 * 1000 * 1000, .bus_num = 0, - } + }, #endif };
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index defc88a..7a8087b 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -114,7 +114,7 @@ .modalias = "mtd_dataflash", .chip_select = 3, .max_speed_hz = 15 * 1000 * 1000, - } + }, #endif };
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index 9895e81..f27c9ff 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c
@@ -118,7 +118,7 @@ .chip_select = 0, .max_speed_hz = 15 * 1000 * 1000, .bus_num = 0, - } + }, #endif };
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 7d41480..5f13356 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -68,7 +68,7 @@ .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, .mask_flags = 0, - } + }, /* two blocks with bad block table (and mirror) at the end */ };
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index ff2d241..2e63518 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -65,7 +65,7 @@ .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, .mask_flags = 0, - } + }, /* two blocks with bad block table (and mirror) at the end */ };
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index c56ad26..b6444aa 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -130,7 +130,7 @@ .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, .mask_flags = 0, - } + }, /* two blocks with bad block table (and mirror) at the end */ };
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 149baa3..b46eb45 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -130,7 +130,7 @@ .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, .mask_flags = 0, - } + }, /* A few blocks at end hold a flash BBT ... created by TI's CCS * using flashwriter_nand.out, but ignored by TI's versions of * Linux and u-boot. We boot faster by using them.
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index d8d7b2a..af7c54c 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -79,7 +79,7 @@ .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, .mask_flags = 0, - } + }, /* A few blocks at end hold a flash Bad Block Table. */ };
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index d9a913b..a0a1b0b 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c
@@ -71,8 +71,8 @@ .virtual = IXP4XX_DEBUG_UART_BASE_VIRT, .pfn = __phys_to_pfn(IXP4XX_DEBUG_UART_BASE_PHYS), .length = IXP4XX_DEBUG_UART_REGION_SIZE, - .type = MT_DEVICE - } + .type = MT_DEVICE, + }, #endif };
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index b2e8ca1..d968865 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -131,7 +131,7 @@ .pfn = __phys_to_pfn(NOMADIK_IO_PHYSICAL), .length = NOMADIK_IO_SIZE, .type = MT_DEVICE, - } + }, /* static ram and secured ram may be added later */ };
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 1527d529..689ac80 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c
@@ -246,7 +246,7 @@ .resource = dm9000_resources, .dev = { .platform_data = &cm_x300_dm9000_platdata, - } + }, };
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 1a9eb72..92a084d 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c
@@ -395,7 +395,7 @@ .default_trigger = "none", .gpio = GPIO_NR_PALMTC_VIBRA_POWER, .active_low = 1, -} +}, };
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index b624ef6..a89120c 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c
@@ -85,7 +85,7 @@ .pfn = __phys_to_pfn(REALVIEW_EB_UART0_BASE), .length = SZ_4K, .type = MT_DEVICE, - } + }, #endif };
diff --git a/arch/arm/mach-s3c2410/bast-ide.c b/arch/arm/mach-s3c2410/bast-ide.c index 2bed741..288699c 100644 --- a/arch/arm/mach-s3c2410/bast-ide.c +++ b/arch/arm/mach-s3c2410/bast-ide.c
@@ -62,7 +62,7 @@ .dev = { .platform_data = &bast_ide_platdata, .coherent_dma_mask = ~0, - } + }, };
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index a615a93..d1cc22b 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -346,7 +346,7 @@ .start = IRQ_DM9000, .end = IRQ_DM9000, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, - } + }, };
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index a2adb09..2ea0089 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -225,7 +225,7 @@ .start = IRQ_VR1000_DM9000A, .end = IRQ_VR1000_DM9000A, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, - } + }, };
diff --git a/arch/arm/mach-shmobile/intc-sh7377.c b/arch/arm/mach-shmobile/intc-sh7377.c index 51ef3d1..0d6aea1 100644 --- a/arch/arm/mach-shmobile/intc-sh7377.c +++ b/arch/arm/mach-shmobile/intc-sh7377.c
@@ -468,13 +468,13 @@ RTDMAC1_1_DEI3, RTDMAC1_1_DEI2, RTDMAC1_1_DEI1, RTDMAC1_1_DEI0 } }, __IGNORE({ 0xE6940198, 0xE69401D8, 8, /* IMR6AS / IMCR6AS */ { 0, 0, MSIOF, 0, - SGX540, 0, TTI20, 0 } }) + SGX540, 0, TTI20, 0 } }), { 0xE694019C, 0xE69401DC, 8, /* IMR7AS / IMCR7AS */ { 0, TMU_TUNI2, TMU_TUNI1, TMU_TUNI0, 0, 0, 0, 0 } }, __IGNORE({ 0xE69401A0, 0xE69401E0, 8, /* IMR8AS / IMCR8AS */ { 0, 0, 0, 0, - 0, MSU_MSU, MSU_MSU2, MSUG } }) + 0, MSU_MSU, MSU_MSU2, MSUG } }), { 0xE69401A4, 0xE69401E4, 8, /* IMR9AS / IMCR9AS */ { __IGNORE0(RWDT1), __IGNORE0(RWDT0), __IGNORE0(CMT2), CMT0, IIC2_DTEI2, IIC2_WAITI2, IIC2_TACKI2, IIC2_ALI2 } }, @@ -492,7 +492,7 @@ LCDC1, CSIRX, DSITX_DSITX0, DSITX_DSITX1 } }, __IGNORE({ 0xE6950194, 0xE69501D4, 8, /* IMR5AS3 / IMCR5AS3 */ {SPU2_SPU0, SPU2_SPU1, FSI, FMSI, - SCUV, 0, 0, 0 } }) + SCUV, 0, 0, 0 } }), { 0xE6950198, 0xE69501D8, 8, /* IMR6AS3 / IMCR6AS3 */ { TMU1_TUNI10, TMU1_TUNI11, TMU1_TUNI12, TSIF2, CMT4, 0, 0, 0 } }, @@ -510,7 +510,7 @@ /* IPRBS */ { 0xFFD20004, 0, 16, 4, { JPU, LCDC0, 0, __IGNORE0(LCRC) } }, /* IPRCS */ - __IGNORE({ 0xFFD20008, 0, 16, 4, { BBIF2, 0, 0, 0 } }) + __IGNORE({ 0xFFD20008, 0, 16, 4, { BBIF2, 0, 0, 0 } }), /* IPRES */ { 0xFFD20010, 0, 16, 4, { RTDMAC1_1, CEU, __IGNORE0(MFI), VPU } }, /* IPRFS */ @@ -523,7 +523,7 @@ /* IPRIS */ { 0xFFD20020, 0, 16, 4, { 0, __IGNORE0(MSIOF), TSIF0, IIC0 } }, /* IPRJS */ - __IGNORE({ 0xFFD20024, 0, 16, 4, { 0, SGX540, MSUG, MSU } }) + __IGNORE({ 0xFFD20024, 0, 16, 4, { 0, SGX540, MSUG, MSU } }), /* IPRKS */ { 0xFFD20028, 0, 16, 4, { __IGNORE0(_2DG), ASA, LMB, PEP } }, /* IPRLS */ @@ -540,9 +540,9 @@ /* IPRJS3 */ { 0xFFD50024, 0, 16, 4, { LCDC1, CSIRX, DSITX, 0 } }, /* IPRKS3 */ - __IGNORE({ 0xFFD50028, 0, 16, 4, { SPU2, 0, FSI, FMSI } }) + __IGNORE({ 0xFFD50028, 0, 16, 4, { SPU2, 0, FSI, FMSI } }), /* IPRLS3 */ - __IGNORE({ 0xFFD5002C, 0, 16, 4, { SCUV, 0, 0, 0 } }) + __IGNORE({ 0xFFD5002C, 0, 16, 4, { SCUV, 0, 0, 0 } }), /* IPRMS3 */ { 0xFFD50030, 0, 16, 4, { TMU1, 0, 0, TSIF2 } }, /* IPRNS3 */
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index d887674d..34ae97f 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c
@@ -1443,7 +1443,7 @@ .number = U300_DMA_UART1_RX, .name = "UART1 RX", .priority_high = 0, - } + }, #else { .number = U300_DMA_GENERAL_PURPOSE_9, @@ -1464,7 +1464,7 @@ .param.ctrl_lli_chained = flags_memcpy_lli_chained, .param.ctrl_lli = flags_memcpy_lli, .param.ctrl_lli_last = flags_memcpy_lli_last, - } + }, #endif };
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c index e1982d4..0df2930 100644 --- a/arch/arm/mach-w90x900/dev.c +++ b/arch/arm/mach-w90x900/dev.c
@@ -406,7 +406,7 @@ .start = IRQ_KPI, .end = IRQ_KPI, .flags = IORESOURCE_IRQ, - } + }, }; @@ -497,7 +497,7 @@ .start = IRQ_ACTL, .end = IRQ_ACTL, .flags = IORESOURCE_IRQ, - } + }, };