Commit a419aef8b858a2bdb98df60336063d28df4b272f
Committed by
Jiri Kosina
1 parent
2944fcbe03
Exists in
master
and in
39 other branches
trivial: remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Showing 54 changed files with 61 additions and 69 deletions Side-by-side Diff
- arch/s390/hypfs/inode.c
- arch/s390/kvm/interrupt.c
- arch/sparc/kernel/irq_64.c
- arch/um/drivers/net_kern.c
- drivers/block/DAC960.c
- drivers/block/swim3.c
- drivers/char/epca.c
- drivers/gpu/drm/i915/intel_dp.c
- drivers/gpu/drm/radeon/r300.c
- drivers/ide/ide-probe.c
- drivers/ide/umc8672.c
- drivers/isdn/capi/capiutil.c
- drivers/macintosh/rack-meter.c
- drivers/net/arcnet/arc-rawmode.c
- drivers/net/arcnet/capmode.c
- drivers/net/gianfar_ethtool.c
- drivers/net/ibm_newemac/core.c
- drivers/net/igb/igb_main.c
- drivers/net/ll_temac_main.c
- drivers/net/ni52.c
- drivers/net/qlge/qlge_main.c
- drivers/net/skfp/pcmplc.c
- drivers/net/skfp/pmf.c
- drivers/net/skge.c
- drivers/net/sky2.c
- drivers/net/vxge/vxge-config.h
- drivers/net/vxge/vxge-main.c
- drivers/rtc/rtc-omap.c
- drivers/s390/block/dasd_eckd.c
- drivers/s390/net/netiucv.c
- drivers/s390/scsi/zfcp_scsi.c
- drivers/scsi/bnx2i/bnx2i_hwi.c
- drivers/scsi/lpfc/lpfc_ct.c
- drivers/spi/omap_uwire.c
- drivers/spi/spi_s3c24xx.c
- drivers/usb/class/cdc-wdm.c
- drivers/usb/serial/spcp8x5.c
- drivers/uwb/i1480/i1480u-wlp/netdev.c
- drivers/video/cfbcopyarea.c
- drivers/video/imxfb.c
- drivers/video/s3c2410fb.c
- drivers/xen/balloon.c
- fs/autofs/dirhash.c
- fs/btrfs/tree-log.c
- fs/cifs/cifs_dfs_ref.c
- fs/nfs/callback_xdr.c
- fs/ocfs2/quota_global.c
- include/scsi/fc/fc_fc2.h
- kernel/trace/trace_hw_branches.c
- net/wireless/wext-compat.c
- sound/oss/sys_timer.c
- sound/soc/codecs/wm9081.c
- sound/soc/pxa/pxa-ssp.c
- sound/soc/s3c24xx/s3c24xx_uda134x.c
arch/s390/hypfs/inode.c
arch/s390/kvm/interrupt.c
arch/sparc/kernel/irq_64.c
arch/um/drivers/net_kern.c
drivers/block/DAC960.c
... | ... | @@ -6653,7 +6653,7 @@ |
6653 | 6653 | else ErrorCode = get_user(ControllerNumber, |
6654 | 6654 | &UserSpaceControllerInfo->ControllerNumber); |
6655 | 6655 | if (ErrorCode != 0) |
6656 | - break;; | |
6656 | + break; | |
6657 | 6657 | ErrorCode = -ENXIO; |
6658 | 6658 | if (ControllerNumber < 0 || |
6659 | 6659 | ControllerNumber > DAC960_ControllerCount - 1) { |
... | ... | @@ -6661,7 +6661,7 @@ |
6661 | 6661 | } |
6662 | 6662 | Controller = DAC960_Controllers[ControllerNumber]; |
6663 | 6663 | if (Controller == NULL) |
6664 | - break;; | |
6664 | + break; | |
6665 | 6665 | memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); |
6666 | 6666 | ControllerInfo.ControllerNumber = ControllerNumber; |
6667 | 6667 | ControllerInfo.FirmwareType = Controller->FirmwareType; |
drivers/block/swim3.c
drivers/char/epca.c
... | ... | @@ -2239,7 +2239,7 @@ |
2239 | 2239 | struct channel *ch = container_of(work, struct channel, tqueue); |
2240 | 2240 | /* Called in response to a modem change event */ |
2241 | 2241 | if (ch && ch->magic == EPCA_MAGIC) { |
2242 | - struct tty_struct *tty = tty_port_tty_get(&ch->port);; | |
2242 | + struct tty_struct *tty = tty_port_tty_get(&ch->port); | |
2243 | 2243 | |
2244 | 2244 | if (tty && tty->driver_data) { |
2245 | 2245 | if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { |
drivers/gpu/drm/i915/intel_dp.c
... | ... | @@ -232,7 +232,7 @@ |
232 | 232 | for (try = 0; try < 5; try++) { |
233 | 233 | /* Load the send data into the aux channel data registers */ |
234 | 234 | for (i = 0; i < send_bytes; i += 4) { |
235 | - uint32_t d = pack_aux(send + i, send_bytes - i);; | |
235 | + uint32_t d = pack_aux(send + i, send_bytes - i); | |
236 | 236 | |
237 | 237 | I915_WRITE(ch_data + i, d); |
238 | 238 | } |
drivers/gpu/drm/radeon/r300.c
... | ... | @@ -1319,11 +1319,11 @@ |
1319 | 1319 | case 0x443C: |
1320 | 1320 | /* TX_FILTER0_[0-15] */ |
1321 | 1321 | i = (reg - 0x4400) >> 2; |
1322 | - tmp = ib_chunk->kdata[idx] & 0x7;; | |
1322 | + tmp = ib_chunk->kdata[idx] & 0x7; | |
1323 | 1323 | if (tmp == 2 || tmp == 4 || tmp == 6) { |
1324 | 1324 | track->textures[i].roundup_w = false; |
1325 | 1325 | } |
1326 | - tmp = (ib_chunk->kdata[idx] >> 3) & 0x7;; | |
1326 | + tmp = (ib_chunk->kdata[idx] >> 3) & 0x7; | |
1327 | 1327 | if (tmp == 2 || tmp == 4 || tmp == 6) { |
1328 | 1328 | track->textures[i].roundup_h = false; |
1329 | 1329 | } |
drivers/ide/ide-probe.c
... | ... | @@ -1212,7 +1212,7 @@ |
1212 | 1212 | { |
1213 | 1213 | int idx = -ENOENT; |
1214 | 1214 | u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1; |
1215 | - u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;; | |
1215 | + u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0; | |
1216 | 1216 | |
1217 | 1217 | /* |
1218 | 1218 | * Claim an unassigned slot. |
drivers/ide/umc8672.c
drivers/isdn/capi/capiutil.c
drivers/macintosh/rack-meter.c
... | ... | @@ -274,7 +274,7 @@ |
274 | 274 | |
275 | 275 | if (cpu > 1) |
276 | 276 | continue; |
277 | - rcpu = &rm->cpu[cpu];; | |
277 | + rcpu = &rm->cpu[cpu]; | |
278 | 278 | rcpu->prev_idle = get_cpu_idle_time(cpu); |
279 | 279 | rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64()); |
280 | 280 | schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer, |
drivers/net/arcnet/arc-rawmode.c
drivers/net/arcnet/capmode.c
drivers/net/gianfar_ethtool.c
... | ... | @@ -293,7 +293,7 @@ |
293 | 293 | rxtime = get_ictt_value(priv->rxic); |
294 | 294 | rxcount = get_icft_value(priv->rxic); |
295 | 295 | txtime = get_ictt_value(priv->txic); |
296 | - txcount = get_icft_value(priv->txic);; | |
296 | + txcount = get_icft_value(priv->txic); | |
297 | 297 | cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime); |
298 | 298 | cvals->rx_max_coalesced_frames = rxcount; |
299 | 299 |
drivers/net/ibm_newemac/core.c
... | ... | @@ -2556,13 +2556,13 @@ |
2556 | 2556 | if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) |
2557 | 2557 | dev->mdio_ph = 0; |
2558 | 2558 | if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0)) |
2559 | - dev->zmii_ph = 0;; | |
2559 | + dev->zmii_ph = 0; | |
2560 | 2560 | if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0)) |
2561 | - dev->zmii_port = 0xffffffff;; | |
2561 | + dev->zmii_port = 0xffffffff; | |
2562 | 2562 | if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0)) |
2563 | - dev->rgmii_ph = 0;; | |
2563 | + dev->rgmii_ph = 0; | |
2564 | 2564 | if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0)) |
2565 | - dev->rgmii_port = 0xffffffff;; | |
2565 | + dev->rgmii_port = 0xffffffff; | |
2566 | 2566 | if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0)) |
2567 | 2567 | dev->fifo_entry_size = 16; |
2568 | 2568 | if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0)) |
drivers/net/igb/igb_main.c
... | ... | @@ -3966,7 +3966,7 @@ |
3966 | 3966 | /* VFs are limited to using the MTA hash table for their multicast |
3967 | 3967 | * addresses */ |
3968 | 3968 | for (i = 0; i < n; i++) |
3969 | - vf_data->vf_mc_hashes[i] = hash_list[i];; | |
3969 | + vf_data->vf_mc_hashes[i] = hash_list[i]; | |
3970 | 3970 | |
3971 | 3971 | /* Flush and reset the mta with the new values */ |
3972 | 3972 | igb_set_rx_mode(adapter->netdev); |
drivers/net/ll_temac_main.c
... | ... | @@ -865,7 +865,7 @@ |
865 | 865 | dcrs = dcr_resource_start(np, 0); |
866 | 866 | if (dcrs == 0) { |
867 | 867 | dev_err(&op->dev, "could not get DMA register address\n"); |
868 | - goto nodev;; | |
868 | + goto nodev; | |
869 | 869 | } |
870 | 870 | lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0)); |
871 | 871 | dev_dbg(&op->dev, "DCR base: %x\n", dcrs); |
drivers/net/ni52.c
... | ... | @@ -615,10 +615,10 @@ |
615 | 615 | /* addr_len |!src_insert |pre-len |loopback */ |
616 | 616 | writeb(0x2e, &cfg_cmd->adr_len); |
617 | 617 | writeb(0x00, &cfg_cmd->priority); |
618 | - writeb(0x60, &cfg_cmd->ifs);; | |
618 | + writeb(0x60, &cfg_cmd->ifs); | |
619 | 619 | writeb(0x00, &cfg_cmd->time_low); |
620 | 620 | writeb(0xf2, &cfg_cmd->time_high); |
621 | - writeb(0x00, &cfg_cmd->promisc);; | |
621 | + writeb(0x00, &cfg_cmd->promisc); | |
622 | 622 | if (dev->flags & IFF_ALLMULTI) { |
623 | 623 | int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6; |
624 | 624 | if (num_addrs > len) { |
drivers/net/qlge/qlge_main.c
... | ... | @@ -2630,7 +2630,7 @@ |
2630 | 2630 | FLAGS_LI; /* Load irq delay values */ |
2631 | 2631 | if (rx_ring->lbq_len) { |
2632 | 2632 | cqicb->flags |= FLAGS_LL; /* Load lbq values */ |
2633 | - tmp = (u64)rx_ring->lbq_base_dma;; | |
2633 | + tmp = (u64)rx_ring->lbq_base_dma; | |
2634 | 2634 | base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; |
2635 | 2635 | page_entries = 0; |
2636 | 2636 | do { |
... | ... | @@ -2654,7 +2654,7 @@ |
2654 | 2654 | } |
2655 | 2655 | if (rx_ring->sbq_len) { |
2656 | 2656 | cqicb->flags |= FLAGS_LS; /* Load sbq values */ |
2657 | - tmp = (u64)rx_ring->sbq_base_dma;; | |
2657 | + tmp = (u64)rx_ring->sbq_base_dma; | |
2658 | 2658 | base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; |
2659 | 2659 | page_entries = 0; |
2660 | 2660 | do { |
drivers/net/skfp/pcmplc.c
drivers/net/skfp/pmf.c
... | ... | @@ -807,9 +807,9 @@ |
807 | 807 | mib_p->fddiPORTLerFlag ; |
808 | 808 | sp->p4050_pad = 0 ; |
809 | 809 | sp->p4050_cutoff = |
810 | - mib_p->fddiPORTLer_Cutoff ; ; | |
810 | + mib_p->fddiPORTLer_Cutoff ; | |
811 | 811 | sp->p4050_alarm = |
812 | - mib_p->fddiPORTLer_Alarm ; ; | |
812 | + mib_p->fddiPORTLer_Alarm ; | |
813 | 813 | sp->p4050_estimate = |
814 | 814 | mib_p->fddiPORTLer_Estimate ; |
815 | 815 | sp->p4050_reject_ct = |
... | ... | @@ -829,7 +829,7 @@ |
829 | 829 | sp->p4051_porttype = |
830 | 830 | mib_p->fddiPORTMy_Type ; |
831 | 831 | sp->p4051_connectstate = |
832 | - mib_p->fddiPORTConnectState ; ; | |
832 | + mib_p->fddiPORTConnectState ; | |
833 | 833 | sp->p4051_pc_neighbor = |
834 | 834 | mib_p->fddiPORTNeighborType ; |
835 | 835 | sp->p4051_pc_withhold = |
... | ... | @@ -853,7 +853,7 @@ |
853 | 853 | struct smt_p_4053 *sp ; |
854 | 854 | sp = (struct smt_p_4053 *) to ; |
855 | 855 | sp->p4053_multiple = |
856 | - mib_p->fddiPORTMultiple_P ; ; | |
856 | + mib_p->fddiPORTMultiple_P ; | |
857 | 857 | sp->p4053_availablepaths = |
858 | 858 | mib_p->fddiPORTAvailablePaths ; |
859 | 859 | sp->p4053_currentpath = |
drivers/net/skge.c
... | ... | @@ -215,7 +215,7 @@ |
215 | 215 | if (skge->wol & WAKE_MAGIC) |
216 | 216 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; |
217 | 217 | else |
218 | - ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; | |
218 | + ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT; | |
219 | 219 | |
220 | 220 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; |
221 | 221 | skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); |
drivers/net/sky2.c
... | ... | @@ -765,7 +765,7 @@ |
765 | 765 | if (sky2->wol & WAKE_MAGIC) |
766 | 766 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; |
767 | 767 | else |
768 | - ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; | |
768 | + ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT; | |
769 | 769 | |
770 | 770 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; |
771 | 771 | sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); |
drivers/net/vxge/vxge-config.h
... | ... | @@ -1541,7 +1541,7 @@ |
1541 | 1541 | rxd_info->l4_cksum_valid = |
1542 | 1542 | (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0); |
1543 | 1543 | rxd_info->l4_cksum = |
1544 | - (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);; | |
1544 | + (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0); | |
1545 | 1545 | rxd_info->frame = |
1546 | 1546 | (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0); |
1547 | 1547 | rxd_info->proto = |
drivers/net/vxge/vxge-main.c
... | ... | @@ -2350,7 +2350,7 @@ |
2350 | 2350 | enum vxge_hw_status status; |
2351 | 2351 | /* 0 - Tx, 1 - Rx */ |
2352 | 2352 | int tim_msix_id[4]; |
2353 | - int alarm_msix_id = 0, msix_intr_vect = 0;; | |
2353 | + int alarm_msix_id = 0, msix_intr_vect = 0; | |
2354 | 2354 | vdev->intr_cnt = 0; |
2355 | 2355 | |
2356 | 2356 | /* allocate msix vectors */ |
drivers/rtc/rtc-omap.c
drivers/s390/block/dasd_eckd.c
... | ... | @@ -706,7 +706,7 @@ |
706 | 706 | sizeof(uid->serial) - 1); |
707 | 707 | EBCASC(uid->serial, sizeof(uid->serial) - 1); |
708 | 708 | uid->ssid = private->gneq->subsystemID; |
709 | - uid->real_unit_addr = private->ned->unit_addr;; | |
709 | + uid->real_unit_addr = private->ned->unit_addr; | |
710 | 710 | if (private->sneq) { |
711 | 711 | uid->type = private->sneq->sua_flags; |
712 | 712 | if (uid->type == UA_BASE_PAV_ALIAS) |
drivers/s390/net/netiucv.c
drivers/s390/scsi/zfcp_scsi.c
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 | if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) || |
103 | 103 | !(status & ZFCP_STATUS_COMMON_RUNNING))) { |
104 | 104 | zfcp_scsi_command_fail(scpnt, DID_ERROR); |
105 | - return 0;; | |
105 | + return 0; | |
106 | 106 | } |
107 | 107 | |
108 | 108 | ret = zfcp_fsf_send_fcp_command_task(unit, scpnt); |
drivers/scsi/bnx2i/bnx2i_hwi.c
... | ... | @@ -1340,7 +1340,7 @@ |
1340 | 1340 | resp_hdr->opcode = login->op_code; |
1341 | 1341 | resp_hdr->flags = login->response_flags; |
1342 | 1342 | resp_hdr->max_version = login->version_max; |
1343 | - resp_hdr->active_version = login->version_active;; | |
1343 | + resp_hdr->active_version = login->version_active; | |
1344 | 1344 | resp_hdr->hlength = 0; |
1345 | 1345 | |
1346 | 1346 | hton24(resp_hdr->dlength, login->data_length); |
drivers/scsi/lpfc/lpfc_ct.c
... | ... | @@ -1207,7 +1207,7 @@ |
1207 | 1207 | vport->ct_flags &= ~FC_CT_RFF_ID; |
1208 | 1208 | CtReq->CommandResponse.bits.CmdRsp = |
1209 | 1209 | be16_to_cpu(SLI_CTNS_RFF_ID); |
1210 | - CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);; | |
1210 | + CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID); | |
1211 | 1211 | CtReq->un.rff.fbits = FC4_FEATURE_INIT; |
1212 | 1212 | CtReq->un.rff.type_code = FC_FCP_DATA; |
1213 | 1213 | cmpl = lpfc_cmpl_ct_cmd_rff_id; |
drivers/spi/omap_uwire.c
drivers/spi/spi_s3c24xx.c
drivers/usb/class/cdc-wdm.c
drivers/usb/serial/spcp8x5.c
drivers/uwb/i1480/i1480u-wlp/netdev.c
... | ... | @@ -214,7 +214,7 @@ |
214 | 214 | |
215 | 215 | netif_wake_queue(net_dev); |
216 | 216 | #ifdef i1480u_FLOW_CONTROL |
217 | - result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);; | |
217 | + result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL); | |
218 | 218 | if (result < 0) { |
219 | 219 | dev_err(dev, "Can't submit notification URB: %d\n", result); |
220 | 220 | goto error_notif_urb_submit; |
drivers/video/cfbcopyarea.c
drivers/video/imxfb.c
drivers/video/s3c2410fb.c
drivers/xen/balloon.c
fs/autofs/dirhash.c
... | ... | @@ -90,7 +90,7 @@ |
90 | 90 | DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); |
91 | 91 | continue; |
92 | 92 | } |
93 | - while (d_mountpoint(path.dentry) && follow_down(&path)); | |
93 | + while (d_mountpoint(path.dentry) && follow_down(&path)) | |
94 | 94 | ; |
95 | 95 | umount_ok = may_umount(path.mnt); |
96 | 96 | path_put(&path); |
fs/btrfs/tree-log.c
fs/cifs/cifs_dfs_ref.c
... | ... | @@ -142,7 +142,7 @@ |
142 | 142 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); |
143 | 143 | if (rc != 0) { |
144 | 144 | cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d", |
145 | - __func__, *devname, rc));; | |
145 | + __func__, *devname, rc)); | |
146 | 146 | goto compose_mount_options_err; |
147 | 147 | } |
148 | 148 | /* md_len = strlen(...) + 12 for 'sep+prefixpath=' |
fs/nfs/callback_xdr.c
fs/ocfs2/quota_global.c
include/scsi/fc/fc_fc2.h
kernel/trace/trace_hw_branches.c
net/wireless/wext-compat.c
sound/oss/sys_timer.c
sound/soc/codecs/wm9081.c
... | ... | @@ -1027,7 +1027,7 @@ |
1027 | 1027 | - wm9081->fs); |
1028 | 1028 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { |
1029 | 1029 | cur_val = abs((wm9081->sysclk_rate / |
1030 | - clk_sys_rates[i].ratio) - wm9081->fs);; | |
1030 | + clk_sys_rates[i].ratio) - wm9081->fs); | |
1031 | 1031 | if (cur_val < best_val) { |
1032 | 1032 | best = i; |
1033 | 1033 | best_val = cur_val; |
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c24xx_uda134x.c