trivial: remove unnecessary semicolons

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index bd9914b8948837e11e589288a174295ebb4a0999..1baa635717b0fb3003dd80de3ece33e5f9490412 100644 (file)
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -496,7 +496,7 @@ static int __init hypfs_init(void)
        }
        s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
        if (!s390_kobj) {
-               rc = -ENOMEM;;
+               rc = -ENOMEM;
                goto fail_sysfs;
        }
        rc = register_filesystem(&hypfs_type);

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 2c2f983534154230219f8ce8a24c2807fae6caf9..43486c2408e1c571c1b933d1105f23dd06e2e2db 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -478,7 +478,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)
        if (!inti)
                return -ENOMEM;
 
-       inti->type = KVM_S390_PROGRAM_INT;;
+       inti->type = KVM_S390_PROGRAM_INT;
        inti->pgm.code = code;
 
        VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code);

diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 8daab33fc17d1808a0abd55bce2d4ac98af0a5c7..8ab1d4728a4bf433f80b5d6ca9a283697f007f67 100644 (file)
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid)
                                tid = ((a << IMAP_AID_SHIFT) |
                                       (n << IMAP_NID_SHIFT));
                                tid &= (IMAP_AID_SAFARI |
-                                       IMAP_NID_SAFARI);;
+                                       IMAP_NID_SAFARI);
                        }
                } else {
                        tid = cpuid << IMAP_TID_SHIFT;

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index f114813ae258eabe782048061b2ed2b44631e2b8..a74245ae3a84db98443460ed794ec70ce15eb15a 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out,
                     char **error_out)
 {
        char *end;
-       int n, err = -EINVAL;;
+       int n, err = -EINVAL;
 
        n = simple_strtoul(str, &end, 0);
        if (end == str) {

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index b839af1702e2c728ff478a3379976c1d7d3ca70a..26caa3ffaff7317830bcf4d2ad81ed4bd5f34b31 100644 (file)
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
        else ErrorCode = get_user(ControllerNumber,
                             &UserSpaceControllerInfo->ControllerNumber);
        if (ErrorCode != 0)
-               break;;
+               break;
        ErrorCode = -ENXIO;
        if (ControllerNumber < 0 ||
            ControllerNumber > DAC960_ControllerCount - 1) {
@@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
        }
        Controller = DAC960_Controllers[ControllerNumber];
        if (Controller == NULL)
-               break;;
+               break;
        memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
        ControllerInfo.ControllerNumber = ControllerNumber;
        ControllerInfo.FirmwareType = Controller->FirmwareType;

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 80df93e3cdd05f0d9c219b6d18bbf8b7a6de517d..572ec6164f2d2b03cb7f9fd0fcbd405032b753d1 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
                goto out_release;
        }
        fs->swim3_intr = macio_irq(mdev, 0);
-       fs->dma_intr = macio_irq(mdev, 1);;
+       fs->dma_intr = macio_irq(mdev, 1);
        fs->cur_cyl = -1;
        fs->cur_sector = -1;
        fs->secpercyl = 36;

diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index ff647ca1c4895d9f08049ea840496b86b40fbf28..9d589e3144de8f0541ba1cd2399e3c49c18f30e5 100644 (file)
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -2239,7 +2239,7 @@ static void do_softint(struct work_struct *work)
        struct channel *ch = container_of(work, struct channel, tqueue);
        /* Called in response to a modem change event */
        if (ch && ch->magic == EPCA_MAGIC) {
-               struct tty_struct *tty = tty_port_tty_get(&ch->port);;
+               struct tty_struct *tty = tty_port_tty_get(&ch->port);
 
                if (tty && tty->driver_data) {
                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2b914d73207681b15fec693677fa2866d437b77f..f4856a510476bcfc117f60ad334d06293d93cd89 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -232,7 +232,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,
        for (try = 0; try < 5; try++) {
                /* Load the send data into the aux channel data registers */
                for (i = 0; i < send_bytes; i += 4) {
-                       uint32_t    d = pack_aux(send + i, send_bytes - i);;
+                       uint32_t    d = pack_aux(send + i, send_bytes - i);
        
                        I915_WRITE(ch_data + i, d);
                }

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 051bca6e3a4f2981d1f580d7bbc174c43ac586d3..b2f5d32efb0cb49f2f645fa2e712999c4e3e694d 100644 (file)
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1319,11 +1319,11 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
        case 0x443C:
                /* TX_FILTER0_[0-15] */
                i = (reg - 0x4400) >> 2;
-               tmp = ib_chunk->kdata[idx] & 0x7;;
+               tmp = ib_chunk->kdata[idx] & 0x7;
                if (tmp == 2 || tmp == 4 || tmp == 6) {
                        track->textures[i].roundup_w = false;
                }
-               tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;;
+               tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;
                if (tmp == 2 || tmp == 4 || tmp == 6) {
                        track->textures[i].roundup_h = false;
                }

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8de442cbee948ca7a6fa646654c08c55650d66a4..63c53d65e875222aa0d2cd60c2d9a5f9f1feb0b6 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1212,7 +1212,7 @@ static int ide_find_port_slot(const struct ide_port_info *d)
 {
        int idx = -ENOENT;
        u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1;
-       u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;;
+       u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;
 
        /*
         * Claim an unassigned slot.

diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c
index 0608d41fb6d0be24cdccbf58f0eff20c70ab6e5d..60f936e2319cb3fef78dab4f05096f535ebe5b72 100644 (file)
--- a/drivers/ide/umc8672.c
+++ b/drivers/ide/umc8672.c
@@ -170,9 +170,9 @@ static int __init umc8672_init(void)
                goto out;
 
        if (umc8672_probe() == 0)
-               return 0;;
+               return 0;
 out:
-       return -ENODEV;;
+       return -ENODEV;
 }
 
 module_init(umc8672_init);

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 16f2e465e5f90df5e24634ddcdf9849c32313780..26626eead82857408fb7729e1f59b530b5a6d2b3 100644 (file)
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void)
        if (!g_debbuf->buf) {
                kfree(g_cmsg);
                kfree(g_debbuf);
-               return -ENOMEM;;
+               return -ENOMEM;
        }
        g_debbuf->size = CDEBUG_GSIZE;
        g_debbuf->buf[0] = 0;

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index a98ab72adf9528f95e5c23d06b27c0d11a83c4a2..93fb32038b14cf2e822708763669dfc855f4e49d 100644 (file)
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
                if (cpu > 1)
                        continue;
-               rcpu = &rm->cpu[cpu];;
+               rcpu = &rm->cpu[cpu];
                rcpu->prev_idle = get_cpu_idle_time(cpu);
                rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
                schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,

diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index 646dfc5f50c9827014f343ba3c62bc7960b85f4e..8ea9c7545c12b815dc899ec64e00de1e56d95c59 100644 (file)
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum,
        BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
        skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
        netif_rx(skb);
 }
 

diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 083e21094b20d69ae6fba917bef34485a5cd5766..66bcbbb6babc057480676a4b413419b016681b8c 100644 (file)
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum,
        BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
        skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
        netif_rx(skb);
 }
 

diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 2234118eedbb66a2aa1c884aab228332f0706d0a..6c144b525b4714cceeacc667bd4d3d2f0c86669a 100644 (file)
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
        rxtime  = get_ictt_value(priv->rxic);
        rxcount = get_icft_value(priv->rxic);
        txtime  = get_ictt_value(priv->txic);
-       txcount = get_icft_value(priv->txic);;
+       txcount = get_icft_value(priv->txic);
        cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime);
        cvals->rx_max_coalesced_frames = rxcount;
 

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 1d7d7fef414f8f64a1a97ab7658214d2af9ea044..89c82c5e63e4e576476eefe65936bce754bd08ff 100644 (file)
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)
        if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
                dev->mdio_ph = 0;
        if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
-               dev->zmii_ph = 0;;
+               dev->zmii_ph = 0;
        if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0))
-               dev->zmii_port = 0xffffffff;;
+               dev->zmii_port = 0xffffffff;
        if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0))
-               dev->rgmii_ph = 0;;
+               dev->rgmii_ph = 0;
        if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0))
-               dev->rgmii_port = 0xffffffff;;
+               dev->rgmii_port = 0xffffffff;
        if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0))
                dev->fifo_entry_size = 16;
        if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0))

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index d2639c4a086dfc0ed7f265c472b9df1c1edcb1db..5d6c1530a8c0458e02ae42305e3accf893f9cdd1 100644 (file)
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
        /* VFs are limited to using the MTA hash table for their multicast
         * addresses */
        for (i = 0; i < n; i++)
-               vf_data->vf_mc_hashes[i] = hash_list[i];;
+               vf_data->vf_mc_hashes[i] = hash_list[i];
 
        /* Flush and reset the mta with the new values */
        igb_set_rx_mode(adapter->netdev);

diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index da8d0a0ca94fd45afdec5a9248dc279842901b8f..f2a197fd47a5fd2bbd6d5d3a5a35fe4d7c16d05b 100644 (file)
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        dcrs = dcr_resource_start(np, 0);
        if (dcrs == 0) {
                dev_err(&op->dev, "could not get DMA register address\n");
-               goto nodev;;
+               goto nodev;
        }
        lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
        dev_dbg(&op->dev, "DCR base: %x\n", dcrs);

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index bd0ac690d12cde2d406c4764f9b6719675ce511d..aad3b370c56284ccaa0f97426d0ba681b35c31c1 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
        /* addr_len |!src_insert |pre-len |loopback */
        writeb(0x2e, &cfg_cmd->adr_len);
        writeb(0x00, &cfg_cmd->priority);
-       writeb(0x60, &cfg_cmd->ifs);;
+       writeb(0x60, &cfg_cmd->ifs);
        writeb(0x00, &cfg_cmd->time_low);
        writeb(0xf2, &cfg_cmd->time_high);
-       writeb(0x00, &cfg_cmd->promisc);;
+       writeb(0x00, &cfg_cmd->promisc);
        if (dev->flags & IFF_ALLMULTI) {
                int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
                if (num_addrs > len) {

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 220529257828a690afc64e7ab2fc726f82a9e7d8..7783c5db81dcf12174e2dc95217336987c6ff10e 100644 (file)
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
            FLAGS_LI;           /* Load irq delay values */
        if (rx_ring->lbq_len) {
                cqicb->flags |= FLAGS_LL;       /* Load lbq values */
-               tmp = (u64)rx_ring->lbq_base_dma;;
+               tmp = (u64)rx_ring->lbq_base_dma;
                base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect;
                page_entries = 0;
                do {
@@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
        }
        if (rx_ring->sbq_len) {
                cqicb->flags |= FLAGS_LS;       /* Load sbq values */
-               tmp = (u64)rx_ring->sbq_base_dma;;
+               tmp = (u64)rx_ring->sbq_base_dma;
                base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect;
                page_entries = 0;
                do {

diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index f1df2ec8ad41a8e7fd4ee3349ebbf6550ea1d983..e6b33ee05ede1473ba91c8b4e8d9124a9122f793 100644 (file)
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)
                        /*PC88b*/
                        if (!phy->cf_join) {
                                phy->cf_join = TRUE ;
-                               queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ;
+                               queue_event(smc,EVENT_CFM,CF_JOIN+np) ;
                        }
                        if (cmd == PC_JOIN)
                                GO_STATE(PC8_ACTIVE) ;

diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index 79e665e0853deb67180afda15b482e388cdbe809..a320fdb3727ded529bd95833c32b50182bccfff6 100644 (file)
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                                mib_p->fddiPORTLerFlag ;
                        sp->p4050_pad = 0 ;
                        sp->p4050_cutoff =
-                               mib_p->fddiPORTLer_Cutoff ; ;
+                               mib_p->fddiPORTLer_Cutoff ;
                        sp->p4050_alarm =
-                               mib_p->fddiPORTLer_Alarm ; ;
+                               mib_p->fddiPORTLer_Alarm ;
                        sp->p4050_estimate =
                                mib_p->fddiPORTLer_Estimate ;
                        sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                        sp->p4051_porttype =
                                mib_p->fddiPORTMy_Type ;
                        sp->p4051_connectstate =
-                               mib_p->fddiPORTConnectState ; ;
+                               mib_p->fddiPORTConnectState ;
                        sp->p4051_pc_neighbor =
                                mib_p->fddiPORTNeighborType ;
                        sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                        struct smt_p_4053       *sp ;
                        sp = (struct smt_p_4053 *) to ;
                        sp->p4053_multiple =
-                               mib_p->fddiPORTMultiple_P ; ;
+                               mib_p->fddiPORTMultiple_P ;
                        sp->p4053_availablepaths =
                                mib_p->fddiPORTAvailablePaths ;
                        sp->p4053_currentpath =

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 62e852e21ab2cf7e6444cdd5fab27f2ae5c57484..55bad408196604d454b4e4f8e241cb2b98365e83 100644 (file)
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)
        if (skge->wol & WAKE_MAGIC)
                ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
        else
-               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
        ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
        skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4bb52e9cd371afc58db9e8620bf8a3182643f686..15140f9f2e92883bc7d807ee571afa82fe893539 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
        if (sky2->wol & WAKE_MAGIC)
                ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
        else
-               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+               ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
        ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
        sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);

diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 62779a520ca1d5d8d2c0ac4b110e916756fba1fc..3e94f0ce0900eb8d22bac23b37182a52d2a4863b 100644 (file)
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get(
        rxd_info->l4_cksum_valid =
                (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0);
        rxd_info->l4_cksum =
-               (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);;
+               (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);
        rxd_info->frame =
                (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0);
        rxd_info->proto =

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index b378037a29b560cdac222d6e47cf2b69e455220a..068d7a9d3e36aaf447661fb27e0b9d898325137a 100644 (file)
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)
        enum vxge_hw_status status;
        /* 0 - Tx, 1 - Rx  */
        int tim_msix_id[4];
-       int alarm_msix_id = 0, msix_intr_vect = 0;;
+       int alarm_msix_id = 0, msix_intr_vect = 0;
        vdev->intr_cnt = 0;
 
        /* allocate msix vectors */

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index bd1ce8e2bc1866d8a6fbeff8318b5ac7d105675a..0587d53987fe7db838e77ebac4555b1ba11bb76f 100644 (file)
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -430,7 +430,7 @@ fail:
 
 static int __exit omap_rtc_remove(struct platform_device *pdev)
 {
-       struct rtc_device       *rtc = platform_get_drvdata(pdev);;
+       struct rtc_device       *rtc = platform_get_drvdata(pdev);
 
        device_init_wakeup(&pdev->dev, 0);
 

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index a1ce573648a292255290c1fb1c0c0a335c022d8d..bd9fe2e36dce54f46a07f92a444c476142bcda4d 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device,
               sizeof(uid->serial) - 1);
        EBCASC(uid->serial, sizeof(uid->serial) - 1);
        uid->ssid = private->gneq->subsystemID;
-       uid->real_unit_addr = private->ned->unit_addr;;
+       uid->real_unit_addr = private->ned->unit_addr;
        if (private->sneq) {
                uid->type = private->sneq->sua_flags;
                if (uid->type == UA_BASE_PAV_ALIAS)

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index a4b2c576144bee8000be14bf42781b1d7bc0e512..c84eadd3602af2883dbc8aa719aa2f576962c831 100644 (file)
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,
        IUCV_DBF_TEXT(trace, 3, __func__);
 
         if (count >= IFNAMSIZ)
-                count = IFNAMSIZ - 1;;
+                count = IFNAMSIZ - 1;
 
        for (i = 0, p = buf; i < count && *p; i++, p++) {
                if (*p == '\n' || *p == ' ')

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 3ff726afafc6cf0b1bf92bfbe0342374f4618240..0e1a34627a2e694d25d3abe135991df91c997035 100644 (file)
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
        if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
                     !(status & ZFCP_STATUS_COMMON_RUNNING))) {
                zfcp_scsi_command_fail(scpnt, DID_ERROR);
-               return 0;;
+               return 0;
        }
 
        ret = zfcp_fsf_send_fcp_command_task(unit, scpnt);

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 906cef5cda86e113b4563419eded632a8edc3bc5..41e1b0e7e2ef30403909c226c21f6365afa73c1c 100644 (file)
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session,
        resp_hdr->opcode = login->op_code;
        resp_hdr->flags = login->response_flags;
        resp_hdr->max_version = login->version_max;
-       resp_hdr->active_version = login->version_active;;
+       resp_hdr->active_version = login->version_active;
        resp_hdr->hlength = 0;
 
        hton24(resp_hdr->dlength, login->data_length);

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 9df7ed38e1be8df7714463918a246910b199d11b..9a1bd9534d744fd2e3454ea3c8ff67673324e02b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1207,7 +1207,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                vport->ct_flags &= ~FC_CT_RFF_ID;
                CtReq->CommandResponse.bits.CmdRsp =
                    be16_to_cpu(SLI_CTNS_RFF_ID);
-               CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);;
+               CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
                CtReq->un.rff.fbits = FC4_FEATURE_INIT;
                CtReq->un.rff.type_code = FC_FCP_DATA;
                cmpl = lpfc_cmpl_ct_cmd_rff_id;

diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 8980a5640bd9d16021367720b77690d783dfac3b..e75ba9b2889828a8930d68a6f7c37c25bf926063 100644 (file)
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
        unsigned        bits = ust->bits_per_word;
        unsigned        bytes;
        u16             val, w;
-       int             status = 0;;
+       int             status = 0;
 
        if (!t->tx_buf && !t->rx_buf)
                return 0;

diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 3f3119d760db71fc653b75e77615ce8069b7c300..6ba8aece90b5ffacd46c8d5bc00fb9a802727c08 100644 (file)
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -388,7 +388,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
 
  err_no_iores:
  err_no_pdata:
-       spi_master_put(hw->master);;
+       spi_master_put(hw->master);
 
  err_nomem:
        return err;

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ba589d4ca8bcb9e8783cc47bce18cab3faaa8301..8c64c018b67678a998bcbd555a22c76d3e2aff9b 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -506,8 +506,6 @@ static int wdm_open(struct inode *inode, struct file *file)
        desc = usb_get_intfdata(intf);
        if (test_bit(WDM_DISCONNECTING, &desc->flags))
                goto out;
-
-       ;
        file->private_data = desc;
 
        rv = usb_autopm_get_interface(desc->intf);

diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 61e7c40b94fbd05b72b81765c48553d708e45bbd..1e58220403d1f7f466425d77c1d3ccf124fa993a 100644 (file)
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -544,7 +544,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        }
 
        /* Set Baud Rate */
-       baud = tty_get_baud_rate(tty);;
+       baud = tty_get_baud_rate(tty);
        switch (baud) {
        case 300:       buf[0] = 0x00;  break;
        case 600:       buf[0] = 0x01;  break;

diff --git a/drivers/uwb/i1480/i1480u-wlp/netdev.c b/drivers/uwb/i1480/i1480u-wlp/netdev.c
index 73055530e60f487b8176225c659bb63870fd479d..b236e6969942f29b4031095e000e2ed4d6d287b0 100644 (file)
--- a/drivers/uwb/i1480/i1480u-wlp/netdev.c
+++ b/drivers/uwb/i1480/i1480u-wlp/netdev.c
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)
 
        netif_wake_queue(net_dev);
 #ifdef i1480u_FLOW_CONTROL
-       result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);;
+       result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);
        if (result < 0) {
                dev_err(dev, "Can't submit notification URB: %d\n", result);
                goto error_notif_urb_submit;

diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index df03f3776dcc3b41503018c0cc7d8045bbe67d88..79e5f40e6486687c8e43062c6aaece0c1dc2a071 100644 (file)
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
                                d0 >>= right;
                        } else if (src_idx+n <= bits) {
                                // Single source word
-                               d0 <<= left;;
+                               d0 <<= left;
                        } else {
                                // 2 source words
                                d1 = FB_READL(src + 1);

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 30ae3022f63337f0426453eda4024d5aeea866f0..66358fa825f3888b763a4e513fece8869c6f602f 100644 (file)
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -710,7 +710,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 
        fbi->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(fbi->clk)) {
-               ret = PTR_ERR(fbi->clk);;
+               ret = PTR_ERR(fbi->clk);
                dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
                goto failed_getclock;
        }

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 7da0027e2409f498ac88a175c78e1fb9f0f4b30e..5ffca2adc6a80b7f1ccb2b826d6352ff5e976d6e 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void)
        int ret = platform_driver_register(&s3c2410fb_driver);
 
        if (ret == 0)
-               ret = platform_driver_register(&s3c2412fb_driver);;
+               ret = platform_driver_register(&s3c2412fb_driver);
 
        return ret;
 }

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index f5bbd9e8341660a6d4f5195d1b42350db0288d5d..4d1b322d2b4560b1b1cfb1288770dc53d09988e5 100644 (file)
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -214,7 +214,7 @@ static int increase_reservation(unsigned long nr_pages)
        page = balloon_first_page();
        for (i = 0; i < nr_pages; i++) {
                BUG_ON(page == NULL);
-               frame_list[i] = page_to_pfn(page);;
+               frame_list[i] = page_to_pfn(page);
                page = balloon_next_page(page);
        }
 

diff --git a/fs/autofs/dirhash.c b/fs/autofs/dirhash.c
index 2316e944a109d9daa82a322c566e8621087e2098..e947915109e5aac39392c8863433c7f2bf903857 100644 (file)
--- a/fs/autofs/dirhash.c
+++ b/fs/autofs/dirhash.c
@@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                        DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name));
                        continue;
                }
-               while (d_mountpoint(path.dentry) && follow_down(&path));
+               while (d_mountpoint(path.dentry) && follow_down(&path))
                        ;
                umount_ok = may_umount(path.mnt);
                path_put(&path);

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index d91b0de7c502d13ef51eaeaf667b61cc0230d8a8..30c0d45c1b5e6d7bfda1a07748ac8d86b9dd0b7d 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                                                                extent);
                                cs = btrfs_file_extent_offset(src, extent);
                                cl = btrfs_file_extent_num_bytes(src,
-                                                               extent);;
+                                                               extent);
                                if (btrfs_file_extent_compression(src,
                                                                  extent)) {
                                        cs = 0;

diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index 606912d8f2a885d9272a843e34542adc1cc9c3d0..5e8bc99221cbb7afb899aa733df3eb69f60f0064 100644 (file)
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -142,7 +142,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
        rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
        if (rc != 0) {
                cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d",
-                         __func__, *devname, rc));;
+                         __func__, *devname, rc));
                goto compose_mount_options_err;
        }
        /* md_len = strlen(...) + 12 for 'sep+prefixpath='

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index e5a2dac5f715fe3a98c8c42a6059a29e3914dba3..76b0aa0f73bfca33ac620c6569cbe926f099f901 100644 (file)
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr,
 
        p = read_buf(xdr, len);
        if (unlikely(p == NULL))
-               return htonl(NFS4ERR_RESOURCE);;
+               return htonl(NFS4ERR_RESOURCE);
 
        memcpy(sid->data, p, len);
        return 0;

diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 44f2a5e1d04233bae9fc5b72bf894cbdd67461f2..0578cc14b7a3b095fe0351be1d316d24aa14e2f5 100644 (file)
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -154,7 +154,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block,
                err = -EIO;
                mlog_errno(err);
        }
-       return err;;
+       return err;
 }
 
 /* Read data from global quotafile - avoid pagecache and such because we cannot

diff --git a/include/scsi/fc/fc_fc2.h b/include/scsi/fc/fc_fc2.h
index cff8a8c22f506bd1cf9613ea5da370d74e68cfd2..f87777d0d5bd3a8cef46b07d6330a4b659a3bbf3 100644 (file)
--- a/include/scsi/fc/fc_fc2.h
+++ b/include/scsi/fc/fc_fc2.h
@@ -92,8 +92,7 @@ struct fc_esb {
        __u8    _esb_resvd[4];
        __u8    esb_service_params[112]; /* TBD */
        __u8    esb_seq_status[8];      /* sequence statuses, 8 bytes each */
-} __attribute__((packed));;
-
+} __attribute__((packed));
 
 /*
  * Define expected size for ASSERTs.

diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index ca7d7c4d0c2aef41b74585996001d993ff4505e2..23b63859130e3e4084911ec07842c65c456331a9 100644 (file)
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter)
                    seq_print_ip_sym(seq, it->from, symflags) &&
                    trace_seq_printf(seq, "\n"))
                        return TRACE_TYPE_HANDLED;
-               return TRACE_TYPE_PARTIAL_LINE;;
+               return TRACE_TYPE_PARTIAL_LINE;
        }
        return TRACE_TYPE_UNHANDLED;
 }

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 429dd06a4ecce51772e9d1f24ca7f6ca725fcc36..561a45cf2a6af562784113cedfd0952108895f9e 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,
                return 0;
        }
 
-       return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);;
+       return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);
 }
 EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);
 

diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 107534477a2f4937fd0a308be70d9f10fb46016b..8db6aefe15e4043224a788c2d9bc314e1c2055a9 100644 (file)
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode)
        curr_tempo = 60;
        curr_timebase = 100;
        opened = 1;
-
-       ;
-
        {
                def_tmr.expires = (1) + jiffies;
                add_timer(&def_tmr);

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index c64e55aa63b6df4cf0508e340fba43e89f97fc88..686e5aa972067106f1f88056c5d367020a0c1356 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1027,7 +1027,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream,
                       - wm9081->fs);
        for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
                cur_val = abs((wm9081->sysclk_rate /
-                              clk_sys_rates[i].ratio) - wm9081->fs);;
+                              clk_sys_rates[i].ratio) - wm9081->fs);
                if (cur_val < best_val) {
                        best = i;
                        best_val = cur_val;

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 5b9ed64647898c028f723138ba9789251c8416e6..d11a6d7e384abdfeab68eb47120a251f8734fe47 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,
                        do_div(tmp, freq_out);
                        val = tmp;
 
-                       val = (val << 16) | 64;;
+                       val = (val << 16) | 64;
                        ssp_write_reg(ssp, SSACDD, val);
 
                        ssacd |= (0x6 << 4);

diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c
index 8e79a416db57b06c8f68ab8ae01f13690d9b7c3f..c215d32d6322e410d32465a8b012d54e260694f9 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx_uda134x.c
+++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c
@@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
 {
        int ret = 0;
 #ifdef ENFORCE_RATES
-       struct snd_pcm_runtime *runtime = substream->runtime;;
+       struct snd_pcm_runtime *runtime = substream->runtime;
 #endif
 
        mutex_lock(&clk_lock);