treewide: remove unneeded semicolons

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/powerpc/cpu/ppc4xx/speed.c b/arch/powerpc/cpu/ppc4xx/speed.c
index 3e1a701..49a8295 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/speed.c
+++ b/arch/powerpc/cpu/ppc4xx/speed.c
@@ -709,7 +709,7 @@ unsigned long determine_pci_clock_per(void)
                        pci_period = PERIOD_66_66MHZ;
                        break;
                default:
-                       pci_period = PERIOD_33_33MHZ;;
+                       pci_period = PERIOD_33_33MHZ;
                        break;
        }
 

diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 6a50b39..9f64207 100644 (file)
--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@@ -1880,7 +1880,7 @@ void configure_ppc440ep_pins(void)
        if (ppc440ep_core_selection[PACKET_REJ_FUNC_EN] == CORE_SELECTED)
        {
                mfsdr(SDR0_MFR, sdr0_mfr);
-               sdr0_mfr = (sdr0_mfr & ~SDR0_MFR_PKT_REJ_MASK) | SDR0_MFR_PKT_REJ_EN;;
+               sdr0_mfr = (sdr0_mfr & ~SDR0_MFR_PKT_REJ_MASK) | SDR0_MFR_PKT_REJ_EN;
                mtsdr(SDR0_MFR, sdr0_mfr);
        }
 

diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 774671d..f98231a 100644 (file)
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -161,7 +161,7 @@ static void l2cache_enable(void)    /* see p258 7.4.1 Enabling L2 Cache */
 
        mtdcr( L2_CACHE_CMD, 0x80000000 );      /* issue HCLEAR command via L2_CMD */
 
-       while (!(mfdcr( L2_CACHE_STAT ) & 0x80000000 ))  ;; /* poll L2_SR for completion */
+       while (!(mfdcr( L2_CACHE_STAT ) & 0x80000000 ))  ; /* poll L2_SR for completion */
 
        mtdcr( L2_CACHE_CMD, 0x10000000 );      /* clear cache errors L2_CMD[CCP] */
 

diff --git a/board/freescale/s32v234evb/clock.c b/board/freescale/s32v234evb/clock.c
index d218c21..e8996e0 100644 (file)
--- a/board/freescale/s32v234evb/clock.c
+++ b/board/freescale/s32v234evb/clock.c
@@ -45,7 +45,7 @@ static int select_pll_source_clk(enum pll_type pll, u32 refclk_freq)
                pll_idx = 1;
                break;
        case DDR_PLL:
-               pll_idx = 2;;
+               pll_idx = 2;
                break;
        default:
                pll_idx = pll;

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 00d127e..887b577 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -443,13 +443,13 @@ int misc_init_r(void)
                printf("Recognized BeagleBoardToys WiFi board\n");
                MUX_BBTOYS_WIFI()
                setenv("buddy", "bbtoys-wifi");
-               break;;
+               break;
        case BBTOYS_VGA:
                printf("Recognized BeagleBoardToys VGA board\n");
-               break;;
+               break;
        case BBTOYS_LCD:
                printf("Recognized BeagleBoardToys LCD board\n");
-               break;;
+               break;
        case BCT_BRETTL3:
                printf("Recognized bct electronic GmbH brettl3 board\n");
                break;

diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index dc22ee4..a3916ed 100644 (file)
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -142,7 +142,7 @@ void amplifier_init(void)
 static void i2s_init(void)
 {
        unsigned long i;
-       struct mpc5xxx_psc *psc = (struct mpc5xxx_psc*)MPC5XXX_PSC2;;
+       struct mpc5xxx_psc *psc = (struct mpc5xxx_psc*)MPC5XXX_PSC2;
        struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio*)MPC5XXX_GPIO;
 
        gpio->port_config |= 0x00000070; /* PSC2 ports as Codec with MCLK */

diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c
index 71a986d..4644336 100644 (file)
--- a/drivers/ddr/marvell/axp/ddr3_dqs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dqs.c
@@ -1268,7 +1268,7 @@ int ddr3_set_dqs_centralization_results(MV_DRAM_INFO *dram_info, u32 cs,
 
        max_pup = (ecc + (1 - ecc) * dram_info->num_of_std_pups);
 
-       DEBUG_DQS_RESULTS_S("\n############ LOG LEVEL 2(Windows margins) ############\n");;
+       DEBUG_DQS_RESULTS_S("\n############ LOG LEVEL 2(Windows margins) ############\n");
 
        if (is_tx) {
                DEBUG_DQS_RESULTS_C("DDR3 - DQS TX - Set Dqs Centralization Results - CS: ",

diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 3fb6ed6..2d2c318 100644 (file)
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -49,7 +49,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                case AT45DB081:
@@ -61,7 +61,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                case AT45DB161:
@@ -73,7 +73,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                case AT45DB321:
@@ -85,7 +85,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                case AT45DB642:
@@ -97,7 +97,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                case AT45DB128:
@@ -109,7 +109,7 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].Desc.DataFlash_state = IDLE;
                        dataflash_info[i].logical_address = cs[i].addr;
                        dataflash_info[i].id = dfcode;
-                       found[i] += dfcode;;
+                       found[i] += dfcode;
                        break;
 
                default:

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 15a3ce0..628b420 100644 (file)
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -475,7 +475,7 @@ static void fec_halt(struct eth_device *dev)
 
        /* Disable DMA tasks */
        MCD_killDma(info->txTask);
-       MCD_killDma(info->rxTask);;
+       MCD_killDma(info->rxTask);
 
        /* Disable the Ethernet Controller */
        fecp->ecr &= ~FEC_ECR_ETHER_EN;

diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c
index b3746fb..a18b959 100644 (file)
--- a/drivers/net/mpc512x_fec.c
+++ b/drivers/net/mpc512x_fec.c
@@ -559,7 +559,7 @@ static int mpc512x_fec_recv (struct eth_device *dev)
                /* Graceful stop complete */
                if (in_be32(&fec->eth->x_cntrl) & 0x00000001) {
                        mpc512x_fec_halt (dev);
-                       clrbits_be32(&fec->eth->x_cntrl, 0x00000001);;
+                       clrbits_be32(&fec->eth->x_cntrl, 0x00000001);
                        mpc512x_fec_init (dev, NULL);
                }
        }

diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 67bf140..377d87f 100644 (file)
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -495,7 +495,7 @@ dp83902a_recv(u8 *data, int len)
                                        printf(" %02x", tmp);
                                        if (0 == (++dx % 16)) printf("\n ");
 #endif
-                                       *data++ = tmp;;
+                                       *data++ = tmp;
                                        mlen--;
                                }
                        }

diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 25aa6d1..f663081 100644 (file)
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -320,7 +320,7 @@ void read_a_file(char *fn)
                i++;
                if (i > 32) {
                        printf("\n");
-                       i = 0;;
+                       i = 0;
                }
        }
        printf("\n");

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 03f9bef..2336b56 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -109,7 +109,7 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep)
 #define WARN_ON(condition) ({                                          \
        int __ret_warn_on = !!(condition);                              \
        if (unlikely(__ret_warn_on))                                    \
-               printf("WARNING in %s line %d\n", __FILE__, __LINE__);; \
+               printf("WARNING in %s line %d\n", __FILE__, __LINE__);  \
        unlikely(__ret_warn_on);                                        \
 })
 

diff --git a/tools/img2srec.c b/tools/img2srec.c
index ec76964..75efd76 100644 (file)
--- a/tools/img2srec.c
+++ b/tools/img2srec.c
@@ -112,7 +112,7 @@ static char* ExtractDecimal (uint32_t* value,  char* getPtr)
 
 static void ExtractNumber (uint32_t* value,  char* getPtr)
 {
-  bool  neg = false;;
+  bool  neg = false;
 
   while (*getPtr == ' ') getPtr++;
   if (*getPtr == '-') {