Author: pfg
Date: Sun Apr 10 23:07:00 2016
New Revision: 297793
URL: https://svnweb.freebsd.org/changeset/base/297793

Log:
  Cleanup unnecessary semicolons from the kernel.
  
  Found with devel/coccinelle.

Modified:
  head/sys/arm/altera/socfpga/socfpga_rstmgr.c
  head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
  head/sys/arm/arm/disassem.c
  head/sys/arm/arm/vm_machdep.c
  head/sys/arm/freescale/imx/imx6_sdma.c
  head/sys/arm/freescale/imx/imx6_ssi.c
  head/sys/arm/freescale/vybrid/vf_ccm.c
  head/sys/arm/freescale/vybrid/vf_edma.c
  head/sys/arm/freescale/vybrid/vf_port.c
  head/sys/arm/freescale/vybrid/vf_sai.c
  head/sys/arm/mv/mv_pci.c
  head/sys/arm/samsung/exynos/chrome_ec.c
  head/sys/arm/samsung/exynos/chrome_ec_spi.c
  head/sys/arm/samsung/exynos/chrome_kb.c
  head/sys/arm/samsung/exynos/exynos5_i2c.c
  head/sys/arm/samsung/exynos/exynos5_pad.c
  head/sys/arm64/cavium/thunder_pcie_pem.c
  head/sys/boot/arm/at91/libat91/sd-card.c
  head/sys/boot/common/part.c
  head/sys/boot/userboot/test/test.c
  head/sys/boot/userboot/userboot/elf64_freebsd.c
  head/sys/cam/ctl/ctl_ha.c
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/dev/aac/aac.c
  head/sys/dev/aacraid/aacraid.c
  head/sys/dev/ahci/ahci_pci.c
  head/sys/dev/ata/chipsets/ata-intel.c
  head/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
  head/sys/dev/ath/if_ath.c
  head/sys/dev/bhnd/bcma/bcma_erom.c
  head/sys/dev/bhnd/bhndb/bhndb_pci.c
  head/sys/dev/bhnd/cores/chipc/chipc.c
  head/sys/dev/bhnd/siba/siba.c
  head/sys/dev/bktr/bktr_core.c
  head/sys/dev/bktr/bktr_os.c
  head/sys/dev/bxe/bxe.c
  head/sys/dev/cxgbe/iw_cxgbe/mem.c
  head/sys/dev/cxgbe/t4_main.c
  head/sys/dev/drm2/radeon/radeon_bios.c
  head/sys/dev/etherswitch/arswitch/arswitch.c
  head/sys/dev/etherswitch/arswitch/arswitch_8327.c
  head/sys/dev/etherswitch/ip17x/ip175c.c
  head/sys/dev/etherswitch/ip17x/ip175d.c
  head/sys/dev/hwpmc/hwpmc_mips.c
  head/sys/dev/hyperv/utilities/hv_heartbeat.c
  head/sys/dev/hyperv/utilities/hv_kvp.c
  head/sys/dev/hyperv/utilities/hv_shutdown.c
  head/sys/dev/ie/if_ie_isa.c
  head/sys/dev/ixgbe/if_ix.c
  head/sys/dev/ixgbe/ixgbe_common.c
  head/sys/dev/mii/mii_physubr.c
  head/sys/dev/mmc/host/dwmmc.c
  head/sys/dev/mvs/mvs.c
  head/sys/dev/nand/nand.c
  head/sys/dev/nand/nandsim_chip.c
  head/sys/dev/ncr/ncr.c
  head/sys/dev/nfe/if_nfe.c
  head/sys/dev/oce/oce_mbox.c
  head/sys/dev/oce/oce_sysctl.c
  head/sys/dev/ow/ow.c
  head/sys/dev/patm/if_patm_attach.c
  head/sys/dev/pcf/pcf.c
  head/sys/dev/pdq/pdq.c
  head/sys/dev/qlxgbe/ql_hw.c
  head/sys/dev/ral/rt2860.c
  head/sys/dev/rt/if_rt.c
  head/sys/dev/sound/midi/midi.c
  head/sys/dev/sound/pci/hda/hdaa.c
  head/sys/dev/sym/sym_hipd.c
  head/sys/dev/tdfx/tdfx_pci.c
  head/sys/dev/ti/if_ti.c
  head/sys/dev/uart/uart_dev_msm.c
  head/sys/dev/usb/net/if_mos.c
  head/sys/dev/usb/net/if_ure.c
  head/sys/dev/vt/vt_core.c
  head/sys/fs/nandfs/nandfs_segment.c
  head/sys/fs/nfs/nfs_commonacl.c
  head/sys/fs/nfs/nfs_commonport.c
  head/sys/fs/nfs/nfs_commonsubs.c
  head/sys/fs/nfsclient/nfs_clbio.c
  head/sys/fs/nfsclient/nfs_clport.c
  head/sys/fs/nfsclient/nfs_clrpcops.c
  head/sys/fs/nfsclient/nfs_clstate.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c
  head/sys/fs/nfsserver/nfs_nfsdserv.c
  head/sys/fs/nfsserver/nfs_nfsdsocket.c
  head/sys/fs/nfsserver/nfs_nfsdsubs.c
  head/sys/fs/smbfs/smbfs_io.c
  head/sys/fs/smbfs/smbfs_subr.c
  head/sys/fs/smbfs/smbfs_vnops.c
  head/sys/fs/tmpfs/tmpfs_subr.c
  head/sys/fs/unionfs/union_subr.c
  head/sys/geom/raid/md_promise.c
  head/sys/geom/sched/g_sched.c
  head/sys/kern/vfs_vnops.c
  head/sys/kgssapi/gss_impl.c
  head/sys/mips/mips/db_disasm.c
  head/sys/mips/mips/db_trace.c
  head/sys/net/if_gif.c
  head/sys/net/if_gre.c
  head/sys/netgraph/netflow/ng_netflow.c
  head/sys/netgraph/ng_base.c
  head/sys/netgraph/ng_ipfw.c
  head/sys/netgraph/ng_nat.c
  head/sys/netpfil/ipfw/ip_fw_sockopt.c
  head/sys/netsmb/smb_subr.c
  head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
  head/sys/ofed/drivers/net/mlx4/cmd.c
  head/sys/ofed/drivers/net/mlx4/eq.c
  head/sys/pc98/cbus/olpt.c
  head/sys/powerpc/powermac/fcu.c
  head/sys/powerpc/powermac/pmu.c
  head/sys/powerpc/powermac/smu.c
  head/sys/rpc/clnt_bck.c
  head/sys/sparc64/sparc64/db_disasm.c
  head/sys/x86/cpufreq/smist.c

Modified: head/sys/arm/altera/socfpga/socfpga_rstmgr.c
==============================================================================
--- head/sys/arm/altera/socfpga/socfpga_rstmgr.c        Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/arm/altera/socfpga/socfpga_rstmgr.c        Sun Apr 10 23:07:00 
2016        (r297793)
@@ -145,7 +145,7 @@ rstmgr_sysctl(SYSCTL_HANDLER_ARGS)
                break;
        default:
                return (1);
-       };
+       }
 
        reg = READ4(sc, RSTMGR_BRGMODRST);
        enable = reg & bit ? 0 : 1;

Modified: head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
==============================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c      Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c      Sun Apr 10 23:07:00 
2016        (r297793)
@@ -621,7 +621,7 @@ spurious:
                stop = 1;
                if ((sndr & AML_SDXC_SEND_RESP_136) != 0) {
                        start = 1;
-                       stop = start + 4;;
+                       stop = start + 4;
                }
                for (i = start; i < stop; i++) {
                        pdmar = CSR_READ_4(sc, AML_SDXC_PDMA_REG);

Modified: head/sys/arm/arm/disassem.c
==============================================================================
--- head/sys/arm/arm/disassem.c Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/arm/arm/disassem.c Sun Apr 10 23:07:00 2016        (r297793)
@@ -523,7 +523,7 @@ disasm(const disasm_interface_t *di, vm_
                        else
                                di->di_printf(", ");
                }
-       };
+       }
 
        di->di_printf("\n");
 

Modified: head/sys/arm/arm/vm_machdep.c
==============================================================================
--- head/sys/arm/arm/vm_machdep.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/arm/vm_machdep.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -148,7 +148,7 @@ cpu_fork(register struct thread *td1, re
 
        /* Setup to release spin count in fork_exit(). */
        td2->td_md.md_spinlock_count = 1;
-       td2->td_md.md_saved_cspr = PSR_SVC32_MODE;;
+       td2->td_md.md_saved_cspr = PSR_SVC32_MODE;
 #if __ARM_ARCH >= 6
        td2->td_md.md_tp = td1->td_md.md_tp;
 #else

Modified: head/sys/arm/freescale/imx/imx6_sdma.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_sdma.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/imx/imx6_sdma.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -444,7 +444,7 @@ boot_firmware(struct sdma_softc *sc)
                if (timeout-- <= 0)
                        break;
                DELAY(10);
-       };
+       }
 
        if (ret == 0) {
                device_printf(sc->dev, "SDMA failed to boot\n");

Modified: head/sys/arm/freescale/imx/imx6_ssi.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ssi.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/imx/imx6_ssi.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -463,7 +463,7 @@ find_sdma_controller(struct sc_info *sc)
        if (sdma_sc == NULL) {
                device_printf(sc->dev, "No sDMA found. Can't operate\n");
                return (ENXIO);
-       };
+       }
 
        sc->sdma_sc = sdma_sc;
 

Modified: head/sys/arm/freescale/vybrid/vf_ccm.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_ccm.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/vybrid/vf_ccm.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -379,15 +379,15 @@ set_clock(struct ccm_softc *sc, char *na
                                reg &= ~(clk->sel_mask << clk->sel_shift);
                                reg |= (clk->sel_val << clk->sel_shift);
                                WRITE4(sc, clk->sel_reg, reg);
-                       };
+                       }
 
                        reg = READ4(sc, clk->reg);
                        reg |= clk->enable_reg;
                        reg &= ~(clk->div_mask << clk->div_shift);
                        reg |= (clk->div_val << clk->div_shift);
                        WRITE4(sc, clk->reg, reg);
-               };
-       };
+               }
+       }
 
        return (0);
 }
@@ -425,8 +425,8 @@ ccm_fdt_set(struct ccm_softc *sc)
                                fdt_config += strlen(name) + 1;
                                len -= strlen(name) + 1;
                                set_clock(sc, name);
-                       };
-               };
+                       }
+               }
 
                if (OF_peer(child) == 0) {
                        /* No more siblings. */

Modified: head/sys/arm/freescale/vybrid/vf_edma.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_edma.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/vybrid/vf_edma.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -161,7 +161,7 @@ channel_configure(struct edma_softc *sc,
        } else {
                channel_first = 0;
                mux_num = sc->device_id * 2;
-       };
+       }
 
        /* Take first unused eDMA channel */
        ch = NULL;
@@ -171,12 +171,12 @@ channel_configure(struct edma_softc *sc,
                        break;
                }
                ch = NULL;
-       };
+       }
 
        if (ch == NULL) {
                /* Can't find free channel */
                return (-1);
-       };
+       }
 
        chnum = i;
 

Modified: head/sys/arm/freescale/vybrid/vf_port.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_port.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/vybrid/vf_port.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -171,7 +171,7 @@ port_setup(int pnum, enum ev_type pevt, 
                break;
        default:
                return (-1);
-       };
+       }
 
        reg = READ4(sc, PORT_PCR(pnum));
        reg &= ~(PCR_IRQC_M << PCR_IRQC_S);

Modified: head/sys/arm/freescale/vybrid/vf_sai.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_sai.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/freescale/vybrid/vf_sai.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -433,7 +433,7 @@ find_edma_controller(struct sc_info *sc)
 
        if ((len = OF_getproplen(edma_node, "device-id")) <= 0) {
                return (ENXIO);
-       };
+       }
 
        OF_getprop(edma_node, "device-id", &dts_value, len);
        edma_device_id = fdt32_to_cpu(dts_value);
@@ -447,16 +447,16 @@ find_edma_controller(struct sc_info *sc)
                        if (edma_sc->device_id == edma_device_id) {
                                /* found */
                                break;
-                       };
+                       }
 
                        edma_sc = NULL;
-               };
-       };
+               }
+       }
 
        if (edma_sc == NULL) {
                device_printf(sc->dev, "no eDMA. can't operate\n");
                return (ENXIO);
-       };
+       }
 
        sc->edma_sc = edma_sc;
 
@@ -465,7 +465,7 @@ find_edma_controller(struct sc_info *sc)
        if (sc->edma_chnum < 0) {
                /* cant setup eDMA */
                return (ENXIO);
-       };
+       }
 
        return (0);
 };

Modified: head/sys/arm/mv/mv_pci.c
==============================================================================
--- head/sys/arm/mv/mv_pci.c    Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/arm/mv/mv_pci.c    Sun Apr 10 23:07:00 2016        (r297793)
@@ -842,7 +842,7 @@ mv_pcib_alloc_resource(device_t dev, dev
        default:
                return (BUS_ALLOC_RESOURCE(device_get_parent(dev), dev,
                    type, rid, start, end, count, flags));
-       };
+       }
 
        if (RMAN_IS_DEFAULT_RANGE(start, end)) {
                start = sc->sc_mem_base;

Modified: head/sys/arm/samsung/exynos/chrome_ec.c
==============================================================================
--- head/sys/arm/samsung/exynos/chrome_ec.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/samsung/exynos/chrome_ec.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -176,7 +176,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
 
        for (i = 0; i < dout_len; i++) {
                msg_dout[i + 3] = dout[i];
-       };
+       }
 
        fill_checksum(msg_dout, dout_len + 3);
 
@@ -195,7 +195,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
 
        for (i = 0; i < dinp_len; i++) {
                dinp[i] = msg_dinp[i + 2];
-       };
+       }
 
        free(msg_dout, M_DEVBUF);
        free(msg_dinp, M_DEVBUF);

Modified: head/sys/arm/samsung/exynos/chrome_ec_spi.c
==============================================================================
--- head/sys/arm/samsung/exynos/chrome_ec_spi.c Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/samsung/exynos/chrome_ec_spi.c Sun Apr 10 23:07:00 2016        
(r297793)
@@ -143,7 +143,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
 
        for (i = 0; i < dout_len; i++) {
                msg_dout[i + 3] = dout[i];
-       };
+       }
 
        fill_checksum(msg_dout, dout_len + 3);
 
@@ -177,7 +177,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
 
        for (i = 0; i < dinp_len; i++) {
                dinp[i] = msg_dinp[i + 2];
-       };
+       }
 
        free(msg_dout, M_DEVBUF);
        free(msg_dinp, M_DEVBUF);

Modified: head/sys/arm/samsung/exynos/chrome_kb.c
==============================================================================
--- head/sys/arm/samsung/exynos/chrome_kb.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/samsung/exynos/chrome_kb.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -255,12 +255,12 @@ ckb_check(keyboard_t *kbd)
 
        if (sc->sc_flags & CKB_FLAG_POLLING) {
                return (1);
-       };
+       }
 
        for (i = 0; i < sc->cols; i++)
                if (sc->scan_local[i] != sc->scan[i]) {
                        return (1);
-               };
+               }
 
        if (sc->sc_repeating)
                return (1);
@@ -356,7 +356,7 @@ ckb_read_char_locked(keyboard_t *kbd, in
                callout_reset(&sc->sc_repeat_callout, hz / 10,
                     ckb_repeat, sc);
                return (sc->sc_repeat_key);
-       };
+       }
 
        if (sc->sc_flags & CKB_FLAG_POLLING) {
                for (;;) {
@@ -374,7 +374,7 @@ ckb_read_char_locked(keyboard_t *kbd, in
                        }
                        DELAY(1000);
                }
-       };
+       }
 
        for (i = 0; i < sc->cols; i++) {
                for (j = 0; j < sc->rows; j++) {
@@ -387,7 +387,7 @@ ckb_read_char_locked(keyboard_t *kbd, in
                        key = keymap_read(sc, i, j);
                        if (key == 0) {
                                continue;
-                       };
+                       }
 
                        if (newbit > 0) {
                                /* key pressed */
@@ -841,7 +841,7 @@ chrome_kb_attach(device_t dev)
        for (i = 0; i < sc->cols; i++) {
                sc->scan_local[i] = 0;
                sc->scan[i] = 0;
-       };
+       }
 
        kbd_init_struct(kbd, KBD_DRIVER_NAME, KB_OTHER,
            device_get_unit(dev), 0, 0, 0);
@@ -866,7 +866,7 @@ chrome_kb_attach(device_t dev)
 
        if (kbd_register(kbd) < 0) {
                return (ENXIO);
-       };
+       }
        KBD_CONFIG_DONE(kbd);
 
        return (0);

Modified: head/sys/arm/samsung/exynos/exynos5_i2c.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_i2c.c   Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/samsung/exynos/exynos5_i2c.c   Sun Apr 10 23:07:00 2016        
(r297793)
@@ -292,7 +292,7 @@ i2c_start(device_t dev, u_char slave, in
 
                mtx_unlock(&sc->mutex);
                return (IIC_ENOACK);
-       };
+       }
 
        mtx_unlock(&sc->mutex);
        return (IIC_NOERR);
@@ -387,7 +387,7 @@ i2c_read(device_t dev, char *buf, int le
                        reg = READ1(sc, I2CCON);
                        reg &= ~(ACKGEN);
                        WRITE1(sc, I2CCON, reg);
-               };
+               }
 
                clear_ipend(sc);
 
@@ -444,7 +444,7 @@ i2c_write(device_t dev, const char *buf,
                        DPRINTF("cant i2c write: no ack\n");
                        mtx_unlock(&sc->mutex);
                        return (IIC_ENOACK);
-               };
+               }
 
                (*sent)++;
        }

Modified: head/sys/arm/samsung/exynos/exynos5_pad.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_pad.c   Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm/samsung/exynos/exynos5_pad.c   Sun Apr 10 23:07:00 2016        
(r297793)
@@ -330,10 +330,10 @@ get_bank(struct pad_softc *sc, int gpio_
                        *bank = sc->gpio_map[i];
                        *pin_shift = (gpio_number - n);
                        return (0);
-               };
+               }
 
                n += ngpio;
-       };
+       }
 
        return (-1);
 }
@@ -516,7 +516,7 @@ pad_attach(device_t dev)
                break;
        default:
                goto fail;
-       };
+       }
 
        if (bus_alloc_resources(dev, sc->pad_spec, sc->res)) {
                device_printf(dev, "could not allocate resources\n");
@@ -528,7 +528,7 @@ pad_attach(device_t dev)
        for (i = 0; i < sc->nports; i++) {
                sc->bst[i] = rman_get_bustag(sc->res[i]);
                sc->bsh[i] = rman_get_bushandle(sc->res[i]);
-       };
+       }
 
        sc->dev = dev;
 

Modified: head/sys/arm64/cavium/thunder_pcie_pem.c
==============================================================================
--- head/sys/arm64/cavium/thunder_pcie_pem.c    Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/arm64/cavium/thunder_pcie_pem.c    Sun Apr 10 23:07:00 2016        
(r297793)
@@ -530,7 +530,7 @@ thunder_pem_alloc_resource(device_t dev,
                parent_dev = device_get_parent(device_get_parent(dev));
                return (BUS_ALLOC_RESOURCE(parent_dev, dev, type, rid, start,
                    end, count, flags));
-       };
+       }
 
 
        if (!RMAN_IS_DEFAULT_RANGE(start, end)) {

Modified: head/sys/boot/arm/at91/libat91/sd-card.c
==============================================================================
--- head/sys/boot/arm/at91/libat91/sd-card.c    Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/boot/arm/at91/libat91/sd-card.c    Sun Apr 10 23:07:00 2016        
(r297793)
@@ -187,7 +187,7 @@ MCI_StartReadBlock(unsigned blknum, void
        // (PDC) Receiver Transfer Enable
        AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS);
        AT91C_BASE_PDC_MCI->PDC_RPR  = (unsigned int)dataBuffer;
-       AT91C_BASE_PDC_MCI->PDC_RCR  = SD_BLOCK_SIZE / 4;;
+       AT91C_BASE_PDC_MCI->PDC_RCR  = SD_BLOCK_SIZE / 4;
        AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTEN;
 
        // SDHC wants block offset, non-HC wants byte offset.

Modified: head/sys/boot/common/part.c
==============================================================================
--- head/sys/boot/common/part.c Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/boot/common/part.c Sun Apr 10 23:07:00 2016        (r297793)
@@ -514,7 +514,7 @@ vtoc8_parttype(uint16_t type)
                return (PART_FREEBSD_VINUM);
        case VTOC_TAG_FREEBSD_ZFS:
                return (PART_FREEBSD_ZFS);
-       };
+       }
        return (PART_UNKNOWN);
 }
 

Modified: head/sys/boot/userboot/test/test.c
==============================================================================
--- head/sys/boot/userboot/test/test.c  Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/boot/userboot/test/test.c  Sun Apr 10 23:07:00 2016        
(r297793)
@@ -273,7 +273,7 @@ test_diskioctl(void *arg, int unit, u_lo
                break;
        default:
                return (ENOTTY);
-       };
+       }
        return (0);
 }
 

Modified: head/sys/boot/userboot/userboot/elf64_freebsd.c
==============================================================================
--- head/sys/boot/userboot/userboot/elf64_freebsd.c     Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/boot/userboot/userboot/elf64_freebsd.c     Sun Apr 10 23:07:00 
2016        (r297793)
@@ -141,7 +141,7 @@ elf64_exec(struct preloaded_file *fp)
 
        dev_cleanup();
 
-       stack[0] = 0;           /* return address */;
+       stack[0] = 0;           /* return address */
        stack[1] = modulep;
        stack[2] = kernend;
        CALLBACK(copyin, stack, 0x1000, sizeof(stack));

Modified: head/sys/cam/ctl/ctl_ha.c
==============================================================================
--- head/sys/cam/ctl/ctl_ha.c   Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/cam/ctl/ctl_ha.c   Sun Apr 10 23:07:00 2016        (r297793)
@@ -356,7 +356,7 @@ ctl_ha_send(struct ha_softc *softc)
                        printf("%s: sosend() error %d\n", __func__, error);
                        return;
                }
-       };
+       }
 }
 
 static void

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/compat/linprocfs/linprocfs.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -640,7 +640,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS)
        } else {
           startcode = 0;
           startdata = 0;
-       };
+       }
        sbuf_printf(sb, "%d", p->p_pid);
 #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg)
        PS_ADD("comm",          "(%s)", p->p_comm);

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c      Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/aac/aac.c      Sun Apr 10 23:07:00 2016        (r297793)
@@ -3762,7 +3762,7 @@ aac_get_bus_info(struct aac_softc *sc)
                        device_printf(sc->aac_dev,
                            "No memory to add passthrough bus %d\n", i);
                        break;
-               };
+               }
 
                child = device_add_child(sc->aac_dev, "aacp", -1);
                if (child == NULL) {

Modified: head/sys/dev/aacraid/aacraid.c
==============================================================================
--- head/sys/dev/aacraid/aacraid.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/aacraid/aacraid.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -3550,7 +3550,7 @@ aac_container_bus(struct aac_softc *sc)
                device_printf(sc->aac_dev,
                "No memory to add container bus\n");
                panic("Out of memory?!");
-       };
+       }
        child = device_add_child(sc->aac_dev, "aacraidp", -1);
        if (child == NULL) {
                device_printf(sc->aac_dev,
@@ -3662,7 +3662,7 @@ aac_get_bus_info(struct aac_softc *sc)
                        device_printf(sc->aac_dev,
                            "No memory to add passthrough bus %d\n", i);
                        break;
-               };
+               }
 
                child = device_add_child(sc->aac_dev, "aacraidp", -1);
                if (child == NULL) {

Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c        Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/ahci/ahci_pci.c        Sun Apr 10 23:07:00 2016        
(r297793)
@@ -491,7 +491,7 @@ ahci_pci_attach(device_t dev)
        if ((error = ahci_pci_ctlr_reset(dev)) != 0) {
                ahci_free_mem(dev);
                return (error);
-       };
+       }
 
        /* Setup interrupts. */
 

Modified: head/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-intel.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/ata/chipsets/ata-intel.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -380,7 +380,7 @@ ata_intel_ch_attach(device_t dev)
                                } else if (ata_intel_sata_sidpr_test(dev)) {
                                        ch->hw.pm_read = 
ata_intel_sata_sidpr_read;
                                        ch->hw.pm_write = 
ata_intel_sata_sidpr_write;
-                               };
+                               }
                        }
                        if (ch->hw.pm_write != NULL) {
                                ch->flags |= ATA_PERIODIC_POLL;

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c      Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c      Sun Apr 10 23:07:00 
2016        (r297793)
@@ -365,7 +365,7 @@ ar5416ProcessRadarEvent(struct ath_hal *
                        /* Cannot use ctrl channel RSSI if ext channel is 
stronger */
                        if (ext_rssi >= (rssi + 3)) {
                                rssi = 0;
-                       };
+                       }
                        break;
                case EXT_CH_RADAR_FOUND:
                        /* Radar in extended channel */

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c   Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/ath/if_ath.c   Sun Apr 10 23:07:00 2016        (r297793)
@@ -1073,7 +1073,6 @@ ath_attach(u_int16_t devid, struct ath_s
                            | IEEE80211_HTCAP_MAXAMSDU_3839
                                                        /* max A-MSDU length */
                            | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */
-                       ;
 
                /*
                 * Enable short-GI for HT20 only if the hardware

Modified: head/sys/dev/bhnd/bcma/bcma_erom.c
==============================================================================
--- head/sys/dev/bhnd/bcma/bcma_erom.c  Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/bhnd/bcma/bcma_erom.c  Sun Apr 10 23:07:00 2016        
(r297793)
@@ -567,7 +567,7 @@ bcma_erom_get_core_info(struct bcma_erom
                for (u_int j = 0; j < i; j++) {
                        if (buffer[i].vendor == buffer[j].vendor &&
                            buffer[i].device == buffer[j].device)
-                               buffer[i].unit++;;
+                               buffer[i].unit++;
                }
        }
 
@@ -625,7 +625,7 @@ erom_corecfg_fill_port_regions(struct bc
                        EROM_LOG(erom, "unsupported region type %hhx\n",
                            region_type);
                        return (EINVAL);
-       };
+       }
 
        /* Fetch the list to be populated */
        sports = bcma_corecfg_get_port_list(corecfg, port_type);

Modified: head/sys/dev/bhnd/bhndb/bhndb_pci.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_pci.c Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/bhnd/bhndb/bhndb_pci.c Sun Apr 10 23:07:00 2016        
(r297793)
@@ -1007,7 +1007,7 @@ bhndb_pci_discover_quirks(struct bhndb_p
                for (qt = id->quirks; qt->quirks != 0; qt++) {
                        if (bhnd_hwrev_matches(hwrev, &qt->hwrev))
                                quirks |= qt->quirks;
-               };
+               }
        }
 
 

Modified: head/sys/dev/bhnd/cores/chipc/chipc.c
==============================================================================
--- head/sys/dev/bhnd/cores/chipc/chipc.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/bhnd/cores/chipc/chipc.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -160,7 +160,7 @@ chipc_attach(device_t dev)
        for (dq = chipc_quirks; dq->quirks != 0; dq++) {
                if (bhnd_hwrev_matches(bhnd_get_hwrev(dev), &dq->hwrev))
                        sc->quirks |= dq->quirks;
-       };
+       }
 
        // TODO
        switch (bhnd_chipc_nvram_src(dev)) {

Modified: head/sys/dev/bhnd/siba/siba.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/bhnd/siba/siba.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -126,7 +126,7 @@ siba_attach(device_t dev)
                             error = ENXIO;
                             goto cleanup;
                        }
-               };
+               }
        }
 
 cleanup:

Modified: head/sys/dev/bktr/bktr_core.c
==============================================================================
--- head/sys/dev/bktr/bktr_core.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/bktr/bktr_core.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -590,7 +590,7 @@ bktr_store_address(unit, BKTR_MEM_BUF,  
                        bktr->id = BROOKTREE_879;
                        break;
                }
-       };
+       }
 
        bktr->clr_on_start = FALSE;
 
@@ -3046,7 +3046,7 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, 
                /* sync vro */
                *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO;
                *dma_prog++ = 0;  /* NULL WORD */
-               *dma_prog++ = OP_JUMP; ;
+               *dma_prog++ = OP_JUMP;
                *dma_prog = (uint32_t ) vtophys(bktr->odd_dma_prog);
                break;
        }

Modified: head/sys/dev/bktr/bktr_os.c
==============================================================================
--- head/sys/dev/bktr/bktr_os.c Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/bktr/bktr_os.c Sun Apr 10 23:07:00 2016        (r297793)
@@ -304,7 +304,7 @@ bktr_probe( device_t dev )
                        device_set_desc(dev, "BrookTree 879");
                        return BUS_PROBE_DEFAULT;
                }
-       };
+       }
 
         return ENXIO;
 }

Modified: head/sys/dev/bxe/bxe.c
==============================================================================
--- head/sys/dev/bxe/bxe.c      Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/bxe/bxe.c      Sun Apr 10 23:07:00 2016        (r297793)
@@ -1620,7 +1620,7 @@ bxe_read_dmae(struct bxe_softc *sc,
     /* issue the command and wait for completion */
     if ((rc = bxe_issue_dmae_with_comp(sc, &dmae)) != 0) {
         bxe_panic(sc, ("DMAE failed (%d)\n", rc));
-    };
+    }
 }
 
 void

Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c
==============================================================================
--- head/sys/dev/cxgbe/iw_cxgbe/mem.c   Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/cxgbe/iw_cxgbe/mem.c   Sun Apr 10 23:07:00 2016        
(r297793)
@@ -796,7 +796,7 @@ struct ib_fast_reg_page_list *c4iw_alloc
         if (c4pl)
                 dma_addr = vtophys(c4pl);
         else
-                return ERR_PTR(-ENOMEM);;
+                return ERR_PTR(-ENOMEM);
 
        pci_unmap_addr_set(c4pl, mapping, dma_addr);
        c4pl->dma_addr = dma_addr;

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c        Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/cxgbe/t4_main.c        Sun Apr 10 23:07:00 2016        
(r297793)
@@ -2128,7 +2128,7 @@ rw_via_memwin(struct adapter *sc, int id
                        } else {
                                v = *val++;
                                t4_write_reg(sc, mw->mw_base + addr -
-                                   mw->mw_curpos, htole32(v));;
+                                   mw->mw_curpos, htole32(v));
                        }
                        addr += 4;
                        len -= 4;

Modified: head/sys/dev/drm2/radeon/radeon_bios.c
==============================================================================
--- head/sys/dev/drm2/radeon/radeon_bios.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/drm2/radeon/radeon_bios.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -676,7 +676,7 @@ static bool radeon_acpi_vfct_bios(struct
            vhdr->DeviceID != rdev->ddev->pci_device) {
                DRM_INFO("ACPI VFCT table is not for this card\n");
                goto out_unmap;
-       };
+       }
 
        if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + 
vhdr->ImageLength > tbl_size) {
                DRM_ERROR("ACPI VFCT image truncated\n");

Modified: head/sys/dev/etherswitch/arswitch/arswitch.c
==============================================================================
--- head/sys/dev/etherswitch/arswitch/arswitch.c        Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/dev/etherswitch/arswitch/arswitch.c        Sun Apr 10 23:07:00 
2016        (r297793)
@@ -225,7 +225,7 @@ arswitch_set_vlan_mode(struct arswitch_s
                break;
        default:
                sc->vlan_mode = 0;
-       };
+       }
 
        /* Reset VLANs. */
        sc->hal.arswitch_vlan_init_hw(sc);

Modified: head/sys/dev/etherswitch/arswitch/arswitch_8327.c
==============================================================================
--- head/sys/dev/etherswitch/arswitch/arswitch_8327.c   Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/dev/etherswitch/arswitch/arswitch_8327.c   Sun Apr 10 23:07:00 
2016        (r297793)
@@ -662,7 +662,7 @@ ar8327_hw_setup(struct arswitch_softc *s
                /* start PHY autonegotiation? */
                /* XXX is this done as part of the normal PHY setup? */
 
-       };
+       }
 
        /* Let things settle */
        DELAY(1000);

Modified: head/sys/dev/etherswitch/ip17x/ip175c.c
==============================================================================
--- head/sys/dev/etherswitch/ip17x/ip175c.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/etherswitch/ip17x/ip175c.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -210,7 +210,7 @@ ip175c_set_vlan_mode(struct ip17x_softc 
                ip17x_updatephy(sc->sc_dev, 30, 9, 0x80, 0);
                sc->vlan_mode = ETHERSWITCH_VLAN_PORT;
                break;
-       };
+       }
 
        /* Reset vlans. */
        ip17x_reset_vlans(sc, sc->vlan_mode);

Modified: head/sys/dev/etherswitch/ip17x/ip175d.c
==============================================================================
--- head/sys/dev/etherswitch/ip17x/ip175d.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/etherswitch/ip17x/ip175d.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -167,7 +167,7 @@ ip175d_set_vlan_mode(struct ip17x_softc 
                ip17x_updatephy(sc->sc_dev, 22, 0, 0xbfff, 0x8000);
                sc->vlan_mode = 0;
                break;
-       };
+       }
 
        if (sc->vlan_mode != 0) {
                /*

Modified: head/sys/dev/hwpmc/hwpmc_mips.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_mips.c     Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/hwpmc/hwpmc_mips.c     Sun Apr 10 23:07:00 2016        
(r297793)
@@ -543,7 +543,7 @@ pmc_next_frame(register_t *pc, register_
                        case OP_SYSCALL:
                        case OP_BREAK:
                                more = 1;       /* stop now */
-                       };
+                       }
                        break;
 
                case OP_BCOND:
@@ -564,7 +564,7 @@ pmc_next_frame(register_t *pc, register_
                        case OP_BCx:
                        case OP_BCy:
                                more = 2;       /* stop after next instruction 
*/
-                       };
+                       }
                        break;
 
                case OP_SW:

Modified: head/sys/dev/hyperv/utilities/hv_heartbeat.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_heartbeat.c        Sun Apr 10 22:43:36 
2016        (r297792)
+++ head/sys/dev/hyperv/utilities/hv_heartbeat.c        Sun Apr 10 23:07:00 
2016        (r297793)
@@ -59,7 +59,7 @@ hv_heartbeat_cb(void *context)
        hv_util_sc                      *softc;
 
        softc = (hv_util_sc*)context;
-       buf = softc->receive_buffer;;
+       buf = softc->receive_buffer;
        channel = softc->hv_dev->channel;
 
        ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE, &recvlen,

Modified: head/sys/dev/hyperv/utilities/hv_kvp.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_kvp.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/hyperv/utilities/hv_kvp.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -619,7 +619,7 @@ hv_kvp_process_request(void *context, in
        hv_kvp_log_info("%s: entering hv_kvp_process_request\n", __func__);
 
        sc = (hv_kvp_sc*)context;
-       kvp_buf = sc->util_sc.receive_buffer;;
+       kvp_buf = sc->util_sc.receive_buffer;
        channel = sc->util_sc.hv_dev->channel;
 
        ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,

Modified: head/sys/dev/hyperv/utilities/hv_shutdown.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_shutdown.c Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/hyperv/utilities/hv_shutdown.c Sun Apr 10 23:07:00 2016        
(r297793)
@@ -63,7 +63,7 @@ hv_shutdown_cb(void *context)
        hv_util_sc                      *softc;
 
        softc = (hv_util_sc*)context;
-       buf = softc->receive_buffer;;
+       buf = softc->receive_buffer;
        channel = softc->hv_dev->channel;
        ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE,
                                            &recv_len, &request_id);

Modified: head/sys/dev/ie/if_ie_isa.c
==============================================================================
--- head/sys/dev/ie/if_ie_isa.c Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/ie/if_ie_isa.c Sun Apr 10 23:07:00 2016        (r297793)
@@ -881,7 +881,7 @@ ie_modevent (mod, what, arg)
                break;
        default:
                break;
-       };
+       }
 
        return (0);
 }

Modified: head/sys/dev/ixgbe/if_ix.c
==============================================================================
--- head/sys/dev/ixgbe/if_ix.c  Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/ixgbe/if_ix.c  Sun Apr 10 23:07:00 2016        (r297793)
@@ -2122,7 +2122,7 @@ ixgbe_mc_array_itr(struct ixgbe_hw *hw, 
        mta = (struct ixgbe_mc_addr *)*update_ptr;
        *vmdq = mta->vmdq;
 
-       *update_ptr = (u8*)(mta + 1);;
+       *update_ptr = (u8*)(mta + 1);
        return (mta->addr);
 }
 

Modified: head/sys/dev/ixgbe/ixgbe_common.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe_common.c   Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/ixgbe/ixgbe_common.c   Sun Apr 10 23:07:00 2016        
(r297793)
@@ -1902,7 +1902,7 @@ static s32 ixgbe_ready_eeprom(struct ixg
 
                usec_delay(5);
                ixgbe_standby_eeprom(hw);
-       };
+       }
 
        /*
         * On some parts, SPI write time could vary from 0-20mSec on 3.3V
@@ -1988,7 +1988,7 @@ static void ixgbe_shift_out_eeprom_bits(
                 * EEPROM
                 */
                mask = mask >> 1;
-       };
+       }
 
        /* We leave the "DI" bit set to "0" when we leave this routine. */
        eec &= ~IXGBE_EEC_DI;

Modified: head/sys/dev/mii/mii_physubr.c
==============================================================================
--- head/sys/dev/mii/mii_physubr.c      Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/mii/mii_physubr.c      Sun Apr 10 23:07:00 2016        
(r297793)
@@ -154,7 +154,7 @@ mii_phy_setmedia(struct mii_softc *sc)
                case (IFM_FDX | IFM_FLOW):
                        index = MII_MEDIA_10_T_FDX;
                        break;
-               };
+               }
                break;
 
        case IFM_100_TX:

Modified: head/sys/dev/mmc/host/dwmmc.c
==============================================================================
--- head/sys/dev/mmc/host/dwmmc.c       Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/mmc/host/dwmmc.c       Sun Apr 10 23:07:00 2016        
(r297793)
@@ -191,7 +191,7 @@ dwmmc_ctrl_reset(struct dwmmc_softc *sc,
                if (!(READ4(sc, SDMMC_CTRL) & reset_bits))
                        return (0);
                DELAY(10);
-       };
+       }
 
        device_printf(sc->dev, "Reset failed\n");
 

Modified: head/sys/dev/mvs/mvs.c
==============================================================================
--- head/sys/dev/mvs/mvs.c      Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/mvs/mvs.c      Sun Apr 10 23:07:00 2016        (r297793)
@@ -506,7 +506,7 @@ mvs_set_edma_mode(device_t dev, enum mvs
                                device_printf(dev, "stopping EDMA engine 
failed\n");
                                break;
                        }
-               };
+               }
        }
        ch->curr_mode = mode;
        ch->fbs_enabled = 0;

Modified: head/sys/dev/nand/nand.c
==============================================================================
--- head/sys/dev/nand/nand.c    Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/nand/nand.c    Sun Apr 10 23:07:00 2016        (r297793)
@@ -811,7 +811,7 @@ nand_erase_blocks(struct nand_chip *chip
                        err = ENXIO;
 
                block++;
-       };
+       }
 
        NANDBUS_UNLOCK(nandbus);
 

Modified: head/sys/dev/nand/nandsim_chip.c
==============================================================================
--- head/sys/dev/nand/nandsim_chip.c    Sun Apr 10 22:43:36 2016        
(r297792)
+++ head/sys/dev/nand/nandsim_chip.c    Sun Apr 10 23:07:00 2016        
(r297793)
@@ -309,7 +309,7 @@ nandsim_loop(void *arg)
                                    links);
                                destroy_event(ev);
                                wakeup(ev);
-                       };
+                       }
                        NANDSIM_CHIP_UNLOCK(chip);
                        nandsim_log(chip, NANDSIM_LOG_SM, "destroyed\n");
                        mtx_destroy(&chip->ns_lock);

Modified: head/sys/dev/ncr/ncr.c
==============================================================================
--- head/sys/dev/ncr/ncr.c      Sun Apr 10 22:43:36 2016        (r297792)
+++ head/sys/dev/ncr/ncr.c      Sun Apr 10 23:07:00 2016        (r297793)
@@ -2906,7 +2906,7 @@ static void ncr_script_fill (struct scri
                *p++ =RADDR (dsa);
                *p++ =SCR_CALL;
                *p++ =PADDR (trysel);
-       };
+       }
        *p++ =SCR_JUMP;
        *p++ =PADDRH(tryloop);
 
@@ -2927,7 +2927,7 @@ static void ncr_script_fill (struct scri
                *p++ =PADDR (checkatn);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN;
                *p++ =offsetof (struct dsb, data[i]);
-       };
+       }
 
        *p++ =SCR_CALL;
        *p++ =PADDR (checkatn);
@@ -2951,7 +2951,7 @@ static void ncr_script_fill (struct scri
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT;
                *p++ =offsetof (struct dsb, data[i]);
-       };
+       }
 
        *p++ =SCR_CALL;
        *p++ =PADDR (dispatch);
@@ -2997,7 +2997,7 @@ static void ncr_script_copy_and_bind (nc
                        device_printf(np->dev, "ERROR0 IN SCRIPT at %d.\n",
                            (int)(src - start - 1));
                        DELAY (1000000);
-               };
+               }
 
                if (DEBUG_FLAGS & DEBUG_SCRIPT)
                        printf ("%p:  <%x>\n",
@@ -3062,7 +3062,7 @@ static void ncr_script_copy_and_bind (nc
                default:
                        relocs = 0;
                        break;
-               };
+               }
 
                if (relocs) {
                        while (relocs--) {
@@ -3110,7 +3110,7 @@ static void ncr_script_copy_and_bind (nc
                        offset += 4;
                }
 
-       };
+       }
 }
 
 /*==========================================================
@@ -3614,7 +3614,7 @@ ncr_attach (device_t dev)
                        usrsync = np->maxsync;
                if (usrsync < np->minsync)
                        usrsync = np->minsync;
-       };
+       }
 
        usrwide = (SCSI_NCR_MAX_WIDE);
        if (usrwide > np->maxwide) usrwide=np->maxwide;
@@ -3719,7 +3719,7 @@ ncr_attach (device_t dev)
        if (ncr_snooptest (np)) {
                printf ("CACHE INCORRECTLY CONFIGURED.\n");
                return EINVAL;
-       };
+       }
 
        /*
        **      Install the interrupt handler.
@@ -3817,7 +3817,7 @@ ncr_intr_locked(ncb_p np)
                } while (INB(nc_istat) & (INTF|SIP|DIP));
 
                np->ticks = 100;
-       };
+       }
 
        if (DEBUG_FLAGS & DEBUG_TINY) printf ("]\n");
 }
@@ -3892,7 +3892,7 @@ ncr_action (struct cam_sim *sim, union c
                        ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
                        xpt_done(ccb);
                        return;
-               };
+               }
                
                cp->ccb = ccb;
                
@@ -3923,8 +3923,8 @@ ncr_action (struct cam_sim *sim, union c
                                    != tp->tinfo.goal.offset)) {
                                tp->nego_cp = cp;
                                nego = NS_SYNC;
-                       };
-               };
+                       }
+               }
 
                /*---------------------------------------------------
                **
@@ -3950,11 +3950,11 @@ ncr_action (struct cam_sim *sim, union c
                                if (DEBUG_FLAGS & DEBUG_TAGS) {
                                        PRINT_ADDR(ccb);
                                        printf ("using tag #%d.\n", cp->tag);
-                               };
-                       };
+                               }
+                       }
                } else {
                        cp->tag=0;
-               };
+               }
 
                /*----------------------------------------------------
                **
@@ -4001,7 +4001,7 @@ ncr_action (struct cam_sim *sim, union c
                                printf (".\n");
                        };
                        break;
-               };
+               }
 
                /*----------------------------------------------------
                **
@@ -4435,7 +4435,7 @@ ncr_complete (ncb_p np, nccb_p cp)
                */
                tp->tinfo.goal.period = 0;
                tp->tinfo.goal.offset = 0;
-       };
+       }
 
        /*
        **      Check for extended errors.
@@ -4453,10 +4453,10 @@ ncr_complete (ncb_p np, nccb_p cp)
                default:
                        printf ("extended error %d.\n", cp->xerr_status);
                        break;
-               };
+               }
                if (cp->host_status==HS_COMPLETE)
                        cp->host_status = HS_FAIL;
-       };
+       }
 
        /*
        **      Check the status.
@@ -4579,9 +4579,9 @@ ncr_wakeup (ncb_p np, u_long code)
                default:
                        ncr_complete (np, cp);
                        break;
-               };
+               }
                cp = cp -> link_nccb;
-       };
+       }
 }
 
 static void
@@ -4959,7 +4959,7 @@ ncr_setsync(ncb_p np, nccb_p cp, u_char 
                if (cp->ccb->ccb_h.target_id != target) continue;
                cp->sync_status = sxfer;
                cp->wide_status = scntl3;
-       };
+       }
 }
 
 /*==========================================================
@@ -5038,7 +5038,7 @@ static void ncr_setwide (ncb_p np, nccb_
                if (cp->ccb->ccb_h.target_id != target) continue;
                cp->sync_status = sxfer;
                cp->wide_status = scntl3;
-       };
+       }

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to