treewide: remove extra semicolons

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index d1f775e8635346e154d95a05dd2d2d85ff8f0c8c..308ce7a87edd22a8a64237e0f18de745728b7106 100644 (file)
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
         */
        usba_udc_data.pdata.vbus_pin = -EINVAL;
        usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
        if (data && data->vbus_pin > 0) {
                at91_set_gpio_input(data->vbus_pin, 0);

diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 1e8f275c17f602349540461bceb989ae34b21ca2..5e9f8a4c38df0d900c326287debd0ea8ce57f604 100644 (file)
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 {
        usba_udc_data.pdata.vbus_pin = -EINVAL;
        usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
        if (data && data->vbus_pin > 0) {
                at91_set_gpio_input(data->vbus_pin, 0);

diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 53aaa94df75a1fbce525da6f2919b94d90827b91..c49262bddd851db28d12415c73203a532ae3d431 100644 (file)
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
         */
        usba_udc_data.pdata.vbus_pin = -EINVAL;
        usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+       memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
        if (data && data->vbus_pin > 0) {
                at91_set_gpio_input(data->vbus_pin, 0);

diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 6d7c4eea4dcbcd95a567635667d2ccf557878808..3b6f290fde4c157d1dd236283965f42698e76b81 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p)
        const struct clk_mux_sel *sel;
        int shift;
 
-       val = clk_readl(c->reg + SUPER_CLK_MUX);;
+       val = clk_readl(c->reg + SUPER_CLK_MUX);
        BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) &&
                ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE));
        shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ?

diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index 80c1526f2af3f60a809386a4fb7f60e2cbfbbc12..d9df5a060a83fdb96ca567974ac443395872f094 100644 (file)
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -47,7 +47,7 @@ struct hypfs_dbfs_data {
        void                    *buf;
        void                    *buf_free_ptr;
        size_t                  size;
-       struct hypfs_dbfs_file  *dbfs_file;;
+       struct hypfs_dbfs_file  *dbfs_file;
        struct kref             kref;
 };
 

diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index 7e0619c2c2c61531749dc8f22b5612d42d6f5b85..c0ef803c7c709d2178f028585f00c658bf6441c6 100644 (file)
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -116,7 +116,7 @@ static int __init mmapper_init(void)
        if (err) {
                printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
                       err);
-               return err;;
+               return err;
        }
        return 0;
 }

diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index 560ab648cf1861dc7cae22e85306b5d87c7fbcde..1b06f67e1f69b4f19f1318b1fbbe6b252e2a1df0 100644 (file)
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip,
        lnw_gpio_set(chip, offset, value);
        spin_lock_irqsave(&lnw->lock, flags);
        value = readl(gpdr);
-       value |= BIT(offset % 32);;
+       value |= BIT(offset % 32);
        writel(value, gpdr);
        spin_unlock_irqrestore(&lnw->lock, flags);
        return 0;

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index f05bb08d0f0968e49a51e7b96aeee392c48287d2..f369e56d6547ced1e92444c8f22cad3e3e09060d 100644 (file)
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -234,7 +234,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
                                                        MC13783_LED_Cx_PERIOD;
 
        if (pdata->flags & MC13783_LED_TRIODE_TC3)
-               reg |= MC13783_LED_Cx_TRIODE_TC_BIT;;
+               reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
 
        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
        if (ret)

diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index aeea9f9ff6e8ac4798feb8d664f2a774f5dc9219..8d7595344a620189e2b5765fc303e2e0b8ed7bfe 100644 (file)
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -797,7 +797,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
        ret = -EINVAL;
        pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!pres)
-               goto platform_resource_failed;;
+               goto platform_resource_failed;
        card->dpram_phys = pres->start;
        card->dpram_size = pres->end - pres->start + 1;
        card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);

diff --git a/drivers/net/wireless/ath/ath9k/phy.h b/drivers/net/wireless/ath/ath9k/phy.h
index 5e3d7496986e77656912ab5b7c7745d9f3f36cee..3a7cd7523d5cf6e318b9604fa28e932e4a39c041 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/phy.h
+++ b/drivers/net/wireless/ath/ath9k/phy.h
@@ -54,7 +54,7 @@
 #define RF_BANK_SETUP(_bank, _iniarray, _col) do {                     \
                int i;                                                  \
                for (i = 0; i < (_iniarray)->ia_rows; i++)              \
-                       (_bank)[i] = INI_RA((_iniarray), i, _col);;     \
+                       (_bank)[i] = INI_RA((_iniarray), i, _col);      \
        } while (0)
 
 #define        AR_PHY_TIMING11_SPUR_FREQ_SD            0x3FF00000

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 581dc9f102738a3433da6f56438ea242484eaf6c..31233a330372b905cfde829b606b6ee3473d706a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2062,7 +2062,7 @@ static const char *desc_lookup(u32 num)
        max = ARRAY_SIZE(advanced_lookup) - 1;
        for (i = 0; i < max; i++) {
                if (advanced_lookup[i].num == num)
-                       break;;
+                       break;
        }
        return advanced_lookup[i].name;
 }

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index e4f4aee8f2988f7ce75d8bcbba1c32906217a4dc..d52fa27103c65e05c4463ba2d6f5039665eb9928 100644 (file)
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -719,7 +719,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, u64 tsf)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-       u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;;
+       u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
 
        mac->tsf = tsf;
        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss));

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 9cd7703c2a3035d06f1cdc8e8c781185f2899422..baa2efeeedf6083c11b6d05272d8bf6fb17568cb 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1226,7 +1226,7 @@ static unsigned int _rtl_mac_to_hwqueue(__le16 fc,
                hw_queue_index = VI_QUEUE;
                break;
        case 2:
-               hw_queue_index = BE_QUEUE;;
+               hw_queue_index = BE_QUEUE;
                break;
        case 3:
                hw_queue_index = BK_QUEUE;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 05477f465a7531b6b499f1679c0c63a3edcfd9a6..7432c85a8dfff7430da8859776496692fa758b3e 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -729,7 +729,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
        rtl_write_word(rtlpriv, REG_CR, 0x2ff);
 
        if (_rtl92ce_llt_table_init(hw) == false)
-               return false;;
+               return false;
 
        rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff);
        rtl_write_byte(rtlpriv, REG_HISRE, 0xff);
@@ -786,7 +786,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
 
        rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0);
 
-       return true;;
+       return true;
 }
 
 static void _rtl92ce_hw_configure(struct ieee80211_hw *hw)

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index bce3a01da2f0f33137e5901c066cc0f3f2a0f48b..cffcb7c00b0068da7b32a467358b7e71a0388e13 100644 (file)
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -522,7 +522,7 @@ static int pmic_battery_set_charger(struct pmic_power_module_info *pbi,
        if (retval) {
                dev_warn(pbi->dev, "%s(): ipc pmic read failed\n",
                                                                __func__);
-               return retval;;
+               return retval;
        }
 
        return 0;

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 24e20ba9633c6f1f27fdbcd3946a2c5f9382c056..44ac4aef879fd6516b8a6548299e6878d06c94bb 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -618,7 +618,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
                                    + BE2_NOPOUT_REQ));
        phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count;
        phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2;
-       phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;;
+       phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;
        phba->params.num_sge_per_io = BE2_SGE;
        phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ;
        phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ;
@@ -781,7 +781,7 @@ static irqreturn_t be_isr(int irq, void *dev_id)
        int isr;
 
        phba = dev_id;
-       ctrl = &phba->ctrl;;
+       ctrl = &phba->ctrl;
        isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET +
                       (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE));
        if (!isr)

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 0dd43bb916181a4496c3ca4ea01179e2912e9999..04fef038b1ffc291ebcf2a0bda4d1579ca788132 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -595,7 +595,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
        dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
        dd_data->context_un.iocb.rspiocbq = rspiocbq;
        dd_data->context_un.iocb.set_job = job;
-       dd_data->context_un.iocb.bmp = NULL;;
+       dd_data->context_un.iocb.bmp = NULL;
        dd_data->context_un.iocb.ndlp = ndlp;
 
        if (phba->cfg_poll & DISABLE_FCP_RING_INT) {

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 002360da01e309b724cac5c7232ee9746a8ce3c4..172cefb6deb9436b2ace38f7f1477fb2d0dc40e2 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
 static void pm8001_tasklet(unsigned long opaque)
 {
        struct pm8001_hba_info *pm8001_ha;
-       pm8001_ha = (struct pm8001_hba_info *)opaque;;
+       pm8001_ha = (struct pm8001_hba_info *)opaque;
        if (unlikely(!pm8001_ha))
                BUG_ON(1);
        PM8001_CHIP_DISP->isr(pm8001_ha);

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a94a0ca56f1a9b9dcc2b1ab1a52fd6a09b..8b4d99a224f380743150d5bd26b018009da54b04 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1051,7 +1051,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                }
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
        } else {
-               bsg_job->reply->result =  DID_OK << 16;;
+               bsg_job->reply->result =  DID_OK << 16;
                bsg_job->reply->reply_payload_rcv_len =
                    bsg_job->reply_payload.payload_len;
                bsg_job->reply_len = 0;
@@ -1146,7 +1146,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
        }
        else {
-               bsg_job->reply->result =  DID_OK << 16;;
+               bsg_job->reply->result =  DID_OK << 16;
                bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
                bsg_job->reply_len = 0;
        }

diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 2c5fcfed59344205574b02b139dfc3b2de158d03..e7dddafe73f625e62bde1d1232bb1637a5936ef5 100644 (file)
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -1036,7 +1036,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
        lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL);
        if (!(lu_gp)) {
                printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n");
-               return ERR_PTR(-ENOMEM);;
+               return ERR_PTR(-ENOMEM);
        }
        INIT_LIST_HEAD(&lu_gp->lu_gp_list);
        INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list);
@@ -1044,7 +1044,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
        atomic_set(&lu_gp->lu_gp_ref_cnt, 0);
 
        if (def_group) {
-               lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;;
+               lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;
                lu_gp->lu_gp_valid_id = 1;
                se_global->alua_lu_gps_count++;
        }

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ff9ace01e27aa1610bab23c3e9dec74f1c222deb..39ac190080e2335b5a6288f01ff26ccb0fbb622a 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2131,7 +2131,7 @@ static void transport_failure_reset_queue_depth(struct se_device *dev)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);;
+       spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);
        atomic_inc(&dev->depth_left);
        atomic_inc(&SE_HBA(dev)->left_queue_depth);
        spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);

diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 37e13c3d91d9970446f6ad66aaf96e3955dd33f3..8890612a8d9a9e2e48836c1fbd1aaf057ebbfc68 100644 (file)
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -56,7 +56,7 @@ struct uart_max3110 {
        wait_queue_head_t wq;
        struct task_struct *main_thread;
        struct task_struct *read_thread;
-       struct mutex thread_mutex;;
+       struct mutex thread_mutex;
 
        u32 baud;
        u16 cur_conf;

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 7d0284882984c82ee2daf8bc1ba2454cd0fa9b48..0b2f2dd41416c0cb17f992fcf80dd33c47871bd8 100644 (file)
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -401,7 +401,7 @@ static int mxsfb_set_par(struct fb_info *fb_info)
        writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET);
 
        ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER |
-               CTRL_SET_BUS_WIDTH(host->ld_intf_width);;
+               CTRL_SET_BUS_WIDTH(host->ld_intf_width);
 
        switch (fb_info->var.bits_per_pixel) {
        case 16:

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index ef11daf0cafe9f086f3944b42fd32ff48811f4b2..dbc13e94b612b39759a01fb3605e956dbca807f6 100644 (file)
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -470,7 +470,7 @@ static int evtchn_open(struct inode *inode, struct file *filp)
 
        filp->private_data = u;
 
-       return nonseekable_open(inode, filp);;
+       return nonseekable_open(inode, filp);
 }
 
 static int evtchn_release(struct inode *inode, struct file *filp)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 54469c3eeacdf9f39083357f8d213b9dc643406c..65ea21a974920f299afbaaa1c6e379930098f09b 100644 (file)
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -54,7 +54,7 @@ u64 start_dma_addr;
 
 static dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
 {
-       return phys_to_machine(XPADDR(paddr)).maddr;;
+       return phys_to_machine(XPADDR(paddr)).maddr;
 }
 
 static phys_addr_t xen_bus_to_phys(dma_addr_t baddr)

diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index ee99a9f5dfd3ac251b6b824a1032ce45b68b6ed7..3dcb3a60c33190c56727dd2294f4dbb5ee24284f 100644 (file)
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb,
                        val = inode_val0(inode);
                        break;
                case INODE_USED_OFS:
-                       val = cpu_to_be64(li->li_used_bytes);;
+                       val = cpu_to_be64(li->li_used_bytes);
                        break;
                case INODE_SIZE_OFS:
                        val = cpu_to_be64(i_size_read(inode));

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index c384d634872a24cc673b1cd0f4e9b837cc433982..c4feceda2d96e0c64bf48e2d32f384bd47b403b3 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -3707,7 +3707,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode,
        context->cow_start = cow_start;
        context->cow_len = cow_len;
        context->ref_tree = ref_tree;
-       context->ref_root_bh = ref_root_bh;;
+       context->ref_root_bh = ref_root_bh;
        context->cow_object = xv;
 
        context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd;

diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index 0da058bff8eb280ee2604086a23f89382176133e..beb184689af9a1f225d3ab874a92c5690276c500 100644 (file)
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -385,7 +385,7 @@ static ssize_t pm_qos_power_read(struct file *filp, char __user *buf,
        s32 value;
        unsigned long flags;
        struct pm_qos_object *o;
-       struct pm_qos_request_list *pm_qos_req = filp->private_data;;
+       struct pm_qos_request_list *pm_qos_req = filp->private_data;
 
        if (!pm_qos_req)
                return -EINVAL;

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index bb0b7c128015f5cbb9f23d78b88c4b5e6eec2e7b..838fe25f704c6e9a57514171348ed2372274a688 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -475,7 +475,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
 
        /* If reserves cannot be used, ensure enough pages are in the pool */
        if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
-               goto err;;
+               goto err;
 
        for_each_zone_zonelist_nodemask(zone, z, zonelist,
                                                MAX_NR_ZONES - 1, nodemask) {

diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c
index bca96990218dedeb2791d9df35727a9f47b20ea7..cc2992299e746012823cce8bac9052fb5fab410b 100644 (file)
--- a/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
@@ -293,7 +293,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[],
 
        for (; !before(ip_to, ip); ip += map->hosts) {
                id = ip_to_id(map, ip);
-               ret = adtfn(set, &id, timeout);;
+               ret = adtfn(set, &id, timeout);
 
                if (ret && !ip_set_eexist(ret, flags))
                        return ret;

diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index 1419d0cdbbaccd494051caada325112320a657ec..4195233c49141d90d95a5b46bb56eab0fafdcbda 100644 (file)
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen,
                return 0;
 
        sin->sin_family = AF_INET;
-       return sizeof(struct sockaddr_in);;
+       return sizeof(struct sockaddr_in);
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index ea39cb742ae5b0422d90643024ce8a3bf812973f..47b7d624a6e109a1aaa023b3ac2be2cc743bc2f1 100644 (file)
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -280,7 +280,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 
        length = -ENOMEM;
        if (count >= PAGE_SIZE)
-               goto out;;
+               goto out;
 
        /* No partial writes. */
        length = -EINVAL;
@@ -876,12 +876,12 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 
        length = task_has_security(current, SECURITY__COMPUTE_USER);
        if (length)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        con = kzalloc(size + 1, GFP_KERNEL);
        if (!con)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        user = kzalloc(size + 1, GFP_KERNEL);
@@ -941,7 +941,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
        length = -ENOMEM;
        scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        tcon = kzalloc(size + 1, GFP_KERNEL);

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 362a0cb448db6a4db48e8e2a6d810df6758262f2..6d8ef4a3a9b5bd017a805a86ad2e3fd5737ca8e0 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -990,7 +990,7 @@ int fork_it(char **argv)
        if (!retval)
                print_counters(cnt_delta);
 
-       fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);;
+       fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);
 
        return 0;
 }