treewide: remove extra semicolons
Justin P. Mattock [Sat, 9 Apr 2011 02:49:08 +0000 (19:49 -0700)]
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

33 files changed:
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/s390/hypfs/hypfs.h
arch/um/drivers/mmapper_kern.c
drivers/gpio/langwell_gpio.c
drivers/leds/leds-mc13783.c
drivers/net/can/softing/softing_main.c
drivers/net/wireless/ath/ath9k/phy.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rtlwifi/core.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
drivers/power/intel_mid_battery.c
drivers/scsi/be2iscsi/be_main.c
drivers/scsi/lpfc/lpfc_bsg.c
drivers/scsi/pm8001/pm8001_init.c
drivers/scsi/qla2xxx/qla_isr.c
drivers/target/target_core_alua.c
drivers/target/target_core_transport.c
drivers/tty/serial/mrst_max3110.c
drivers/video/mxsfb.c
drivers/xen/evtchn.c
drivers/xen/swiotlb-xen.c
fs/logfs/readwrite.c
fs/ocfs2/refcounttree.c
kernel/pm_qos_params.c
mm/hugetlb.c
net/netfilter/ipset/ip_set_bitmap_ip.c
net/sunrpc/addr.c
security/selinux/selinuxfs.c
tools/power/x86/turbostat/turbostat.c

index d1f775e..308ce7a 100644 (file)
@@ -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);
index 1e8f275..5e9f8a4 100644 (file)
@@ -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);
index 53aaa94..c49262b 100644 (file)
@@ -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);
index 6d7c4ee..3b6f290 100644 (file)
@@ -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) ?
index 80c1526..d9df5a0 100644 (file)
@@ -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;
 };
 
index 7e0619c..c0ef803 100644 (file)
@@ -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;
 }
index 560ab64..1b06f67 100644 (file)
@@ -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;
index f05bb08..f369e56 100644 (file)
@@ -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)
index aeea9f9..8d75953 100644 (file)
@@ -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);
index 5e3d749..3a7cd75 100644 (file)
@@ -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
index 581dc9f..31233a3 100644 (file)
@@ -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;
 }
index e4f4aee..d52fa27 100644 (file)
@@ -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));
index 9cd7703..baa2efe 100644 (file)
@@ -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;
index 05477f4..7432c85 100644 (file)
@@ -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)
index bce3a01..cffcb7c 100644 (file)
@@ -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;
index 24e20ba..44ac4ae 100644 (file)
@@ -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)
index 0dd43bb..04fef03 100644 (file)
@@ -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) {
index 002360d..172cefb 100644 (file)
@@ -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);
index d17ed9a..8b4d99a 100644 (file)
@@ -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;
        }
index 2c5fcfe..e7dddaf 100644 (file)
@@ -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++;
        }
index ff9ace0..39ac190 100644 (file)
@@ -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);
index 37e13c3..8890612 100644 (file)
@@ -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;
index 7d02848..0b2f2dd 100644 (file)
@@ -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:
index ef11daf..dbc13e9 100644 (file)
@@ -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)
index 54469c3..65ea21a 100644 (file)
@@ -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)
index ee99a9f..3dcb3a6 100644 (file)
@@ -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));
index c384d63..c4feced 100644 (file)
@@ -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;
index 0da058b..beb1846 100644 (file)
@@ -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;
index bb0b7c1..838fe25 100644 (file)
@@ -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) {
index bca9699..cc29922 100644 (file)
@@ -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;
index 1419d0c..4195233 100644 (file)
@@ -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)
index ea39cb7..47b7d62 100644 (file)
@@ -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);
index 362a0cb..6d8ef4a 100644 (file)
@@ -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;
 }