Cleanup unnecessary semicolons from the kernel.

Found with devel/coccinelle.

52 files changed, 169 insertions, 170 deletions

diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index decacb9..4028cb4 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -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) {
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c
index 26b2296..879d466 100644
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@@ -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) {
diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
index 57f7ea9..b6a961f 100644
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@@ -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. */
 
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index 46d0055..502a859 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -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;
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c b/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
index edac235..9759b74 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
@@ -365,7 +365,7 @@ ar5416ProcessRadarEvent(struct ath_hal *ah, struct ath_rx_status *rxs,
 			/* 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 */
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 8b1580a..e2dc250 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -1073,7 +1073,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 			    | 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
diff --git a/sys/dev/bhnd/bcma/bcma_erom.c b/sys/dev/bhnd/bcma/bcma_erom.c
index 2fd3275..3f9abf9 100644
--- a/sys/dev/bhnd/bcma/bcma_erom.c
+++ b/sys/dev/bhnd/bcma/bcma_erom.c
@@ -567,7 +567,7 @@ bcma_erom_get_core_info(struct bcma_erom *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 bcma_erom *erom,
 			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);
diff --git a/sys/dev/bhnd/bhndb/bhndb_pci.c b/sys/dev/bhnd/bhndb/bhndb_pci.c
index 03a0996..ac5409a 100644
--- a/sys/dev/bhnd/bhndb/bhndb_pci.c
+++ b/sys/dev/bhnd/bhndb/bhndb_pci.c
@@ -1007,7 +1007,7 @@ bhndb_pci_discover_quirks(struct bhndb_pci_softc *sc,
 		for (qt = id->quirks; qt->quirks != 0; qt++) {
 			if (bhnd_hwrev_matches(hwrev, &qt->hwrev))
 				quirks |= qt->quirks;
-		};
+		}
 	}
 
 
diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c
index f47a8f2..e03ddfe 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.c
+++ b/sys/dev/bhnd/cores/chipc/chipc.c
@@ -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)) {
diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c
index 5f1410d..9e837e3f 100644
--- a/sys/dev/bhnd/siba/siba.c
+++ b/sys/dev/bhnd/siba/siba.c
@@ -126,7 +126,7 @@ siba_attach(device_t dev)
 			     error = ENXIO;
 			     goto cleanup;
 			}
-		};
+		}
 	}
 
 cleanup:
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index c38afe5..764eda5 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -590,7 +590,7 @@ bktr_store_address(unit, BKTR_MEM_BUF,          buf);
 			bktr->id = BROOKTREE_879;
 			break;
 		}
-	};
+	}
 
 	bktr->clr_on_start = FALSE;
 
@@ -3046,7 +3046,7 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
 		/* 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;
 	}
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index e5ea53b..e8c0f7b 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -304,7 +304,7 @@ bktr_probe( device_t dev )
 			device_set_desc(dev, "BrookTree 879");
 			return BUS_PROBE_DEFAULT;
 		}
-	};
+	}
 
         return ENXIO;
 }
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 53d8e97..91a5bf3 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -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
diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c
index e42aa1a..f7e90a5 100644
--- a/sys/dev/cxgbe/iw_cxgbe/mem.c
+++ b/sys/dev/cxgbe/iw_cxgbe/mem.c
@@ -796,7 +796,7 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
         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;
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 777e4d1..e3b64b0 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -2128,7 +2128,7 @@ rw_via_memwin(struct adapter *sc, int idx, uint32_t addr, uint32_t *val,
 			} 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;
diff --git a/sys/dev/drm2/radeon/radeon_bios.c b/sys/dev/drm2/radeon/radeon_bios.c
index ffb3756..78416bb 100644
--- a/sys/dev/drm2/radeon/radeon_bios.c
+++ b/sys/dev/drm2/radeon/radeon_bios.c
@@ -676,7 +676,7 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
 	    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");
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 4388819..8396f8a 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -225,7 +225,7 @@ arswitch_set_vlan_mode(struct arswitch_softc *sc, uint32_t mode)
 		break;
 	default:
 		sc->vlan_mode = 0;
-	};
+	}
 
 	/* Reset VLANs. */
 	sc->hal.arswitch_vlan_init_hw(sc);
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.c b/sys/dev/etherswitch/arswitch/arswitch_8327.c
index 6e221a8..92e44fc 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.c
@@ -662,7 +662,7 @@ ar8327_hw_setup(struct arswitch_softc *sc)
 		/* start PHY autonegotiation? */
 		/* XXX is this done as part of the normal PHY setup? */
 
-	};
+	}
 
 	/* Let things settle */
 	DELAY(1000);
diff --git a/sys/dev/etherswitch/ip17x/ip175c.c b/sys/dev/etherswitch/ip17x/ip175c.c
index f787052..30614a4 100644
--- a/sys/dev/etherswitch/ip17x/ip175c.c
+++ b/sys/dev/etherswitch/ip17x/ip175c.c
@@ -210,7 +210,7 @@ ip175c_set_vlan_mode(struct ip17x_softc *sc, uint32_t mode)
 		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);
diff --git a/sys/dev/etherswitch/ip17x/ip175d.c b/sys/dev/etherswitch/ip17x/ip175d.c
index 4962ac2..5d43641 100644
--- a/sys/dev/etherswitch/ip17x/ip175d.c
+++ b/sys/dev/etherswitch/ip17x/ip175d.c
@@ -167,7 +167,7 @@ ip175d_set_vlan_mode(struct ip17x_softc *sc, uint32_t mode)
 		ip17x_updatephy(sc->sc_dev, 22, 0, 0xbfff, 0x8000);
 		sc->vlan_mode = 0;
 		break;
-	};
+	}
 
 	if (sc->vlan_mode != 0) {
 		/*
diff --git a/sys/dev/hwpmc/hwpmc_mips.c b/sys/dev/hwpmc/hwpmc_mips.c
index 72f8e89..d9c26af 100644
--- a/sys/dev/hwpmc/hwpmc_mips.c
+++ b/sys/dev/hwpmc/hwpmc_mips.c
@@ -543,7 +543,7 @@ pmc_next_frame(register_t *pc, register_t *sp)
 			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_t *sp)
 			case OP_BCx:
 			case OP_BCy:
 				more = 2;	/* stop after next instruction */
-			};
+			}
 			break;
 
 		case OP_SW:
diff --git a/sys/dev/hyperv/utilities/hv_heartbeat.c b/sys/dev/hyperv/utilities/hv_heartbeat.c
index 09bd28b..62de10b 100644
--- a/sys/dev/hyperv/utilities/hv_heartbeat.c
+++ b/sys/dev/hyperv/utilities/hv_heartbeat.c
@@ -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,
diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c
index d71310b..50563c4 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.c
+++ b/sys/dev/hyperv/utilities/hv_kvp.c
@@ -619,7 +619,7 @@ hv_kvp_process_request(void *context, int pending)
 	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,
diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/hv_shutdown.c
index 0beed5a..b0802af 100644
--- a/sys/dev/hyperv/utilities/hv_shutdown.c
+++ b/sys/dev/hyperv/utilities/hv_shutdown.c
@@ -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);
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index c0403b1..73151b4 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -881,7 +881,7 @@ ie_modevent (mod, what, arg)
 		break;
 	default:
 		break;
-	};
+	}
 
 	return (0);
 }
diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index 5e16fbd..ddee699 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -2122,7 +2122,7 @@ ixgbe_mc_array_itr(struct ixgbe_hw *hw, u8 **update_ptr, u32 *vmdq)
 	mta = (struct ixgbe_mc_addr *)*update_ptr;
 	*vmdq = mta->vmdq;
 
-	*update_ptr = (u8*)(mta + 1);;
+	*update_ptr = (u8*)(mta + 1);
 	return (mta->addr);
 }
 
diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c
index feb74f6..c302071 100644
--- a/sys/dev/ixgbe/ixgbe_common.c
+++ b/sys/dev/ixgbe/ixgbe_common.c
@@ -1902,7 +1902,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
 
 		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(struct ixgbe_hw *hw, u16 data,
 		 * EEPROM
 		 */
 		mask = mask >> 1;
-	};
+	}
 
 	/* We leave the "DI" bit set to "0" when we leave this routine. */
 	eec &= ~IXGBE_EEC_DI;
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 84f4f44..4233159 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -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:
diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c
index 5b24a6d..f55d3e6 100644
--- a/sys/dev/mmc/host/dwmmc.c
+++ b/sys/dev/mmc/host/dwmmc.c
@@ -191,7 +191,7 @@ dwmmc_ctrl_reset(struct dwmmc_softc *sc, int reset_bits)
 		if (!(READ4(sc, SDMMC_CTRL) & reset_bits))
 			return (0);
 		DELAY(10);
-	};
+	}
 
 	device_printf(sc->dev, "Reset failed\n");
 
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index b89db41..bdadf39 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -506,7 +506,7 @@ mvs_set_edma_mode(device_t dev, enum mvs_edma_mode mode)
 				device_printf(dev, "stopping EDMA engine failed\n");
 				break;
 			}
-		};
+		}
 	}
 	ch->curr_mode = mode;
 	ch->fbs_enabled = 0;
diff --git a/sys/dev/nand/nand.c b/sys/dev/nand/nand.c
index 113953e..ae64121 100644
--- a/sys/dev/nand/nand.c
+++ b/sys/dev/nand/nand.c
@@ -811,7 +811,7 @@ nand_erase_blocks(struct nand_chip *chip, off_t offset, size_t len)
 			err = ENXIO;
 
 		block++;
-	};
+	}
 
 	NANDBUS_UNLOCK(nandbus);
 
diff --git a/sys/dev/nand/nandsim_chip.c b/sys/dev/nand/nandsim_chip.c
index 3241e1a..5b568ab 100644
--- a/sys/dev/nand/nandsim_chip.c
+++ b/sys/dev/nand/nandsim_chip.c
@@ -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);
diff --git a/sys/dev/ncr/ncr.c b/sys/dev/ncr/ncr.c
index 111cd69..8cf142f 100644
--- a/sys/dev/ncr/ncr.c
+++ b/sys/dev/ncr/ncr.c
@@ -2906,7 +2906,7 @@ static void ncr_script_fill (struct script * scr, struct scripth * scrh)
 		*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 script * scr, struct scripth * scrh)
 		*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 script * scr, struct scripth * scrh)
 		*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 (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
 			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 (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
 		default:
 			relocs = 0;
 			break;
-		};
+		}
 
 		if (relocs) {
 			while (relocs--) {
@@ -3110,7 +3110,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
 			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 ccb *ccb)
 			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 ccb *ccb)
 				    != tp->tinfo.goal.offset)) {
 				tp->nego_cp = cp;
 				nego = NS_SYNC;
-			};
-		};
+			}
+		}
 
 		/*---------------------------------------------------
 		**
@@ -3950,11 +3950,11 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 				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 ccb *ccb)
 				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 scntl3, u_char sxfer, u_char period)
 		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_p cp, u_char wide, u_char ack)
 		if (cp->ccb->ccb_h.target_id != target) continue;
 		cp->sync_status = sxfer;
 		cp->wide_status = scntl3;
-	};
+	}
 }
 
 /*==========================================================
@@ -5092,7 +5092,7 @@ ncr_timeout (void *arg)
 			**      Let's try to wake it up.
 			*/
 			OUTB (nc_istat, SIGP);
-		};
+		}
 
 		/*----------------------------------------------------
 		**
@@ -5120,7 +5120,7 @@ ncr_timeout (void *arg)
 				    "timeout nccb=%p (skip)\n", cp);
 				cp->phys.header.launch.l_paddr
 				= NCB_SCRIPT_PHYS (np, skip);
-			};
+			}
 
 			switch (cp->host_status) {
 
@@ -5129,14 +5129,14 @@ ncr_timeout (void *arg)
 				/* FALLTHROUGH */
 			case HS_DISCONNECT:
 				cp->host_status=HS_TIMEOUT;
-			};
+			}
 			cp->tag = 0;
 
 			/*
 			**	wakeup this nccb.
 			*/
 			ncr_complete (np, cp);
-		};
+		}
 	}
 
 	callout_reset(&np->timer, step ? step : 1, ncr_timeout, np);
@@ -5150,7 +5150,7 @@ ncr_timeout (void *arg)
 		if (DEBUG_FLAGS & DEBUG_TINY) printf ("{");
 		ncr_exception (np);
 		if (DEBUG_FLAGS & DEBUG_TINY) printf ("}");
-	};
+	}
 }
 
 /*==========================================================
@@ -5255,7 +5255,7 @@ static void ncr_exception (ncb_p np)
 		OUTB (nc_istat, INTF);
 		np->profile.num_fly++;
 		ncr_wakeup (np, 0);
-	};
+	}
 	if (!(istat & (SIP|DIP))) {
 		return;
 	}
@@ -5291,7 +5291,7 @@ static void ncr_exception (ncb_p np)
 	if (sist & RST) {
 		ncr_init (np, bootverbose ? "scsi reset" : NULL, HS_RESET);
 		return;
-	};
+	}
 
 	/*-------------------------------------------
 	**	selection timeout
@@ -5306,7 +5306,7 @@ static void ncr_exception (ncb_p np)
 		!(dstat & (MDPE|BF|ABRT|SIR))) {
 		ncr_int_sto (np);
 		return;
-	};
+	}
 
 	/*-------------------------------------------
 	**      Phase mismatch.
@@ -5318,7 +5318,7 @@ static void ncr_exception (ncb_p np)
 		!(dstat & (MDPE|BF|ABRT|SIR|IID))) {
 		ncr_int_ma (np, dstat);
 		return;
-	};
+	}
 
 	/*----------------------------------------
 	**	move command with length 0
@@ -5335,7 +5335,7 @@ static void ncr_exception (ncb_p np)
 		*/
 		OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, no_data));
 		return;
-	};
+	}
 
 	/*-------------------------------------------
 	**	Programmed interrupt
@@ -5348,7 +5348,7 @@ static void ncr_exception (ncb_p np)
 		(INB(nc_dsps) <= SIR_MAX)) {
 		ncr_int_sir (np);
 		return;
-	};
+	}
 
 	/*========================================
 	**	log message for real hard errors
@@ -5369,7 +5369,7 @@ static void ncr_exception (ncb_p np)
 			((volatile char*)&np->regdump)[i] = INB_OFF(i);
 		np->regdump.nc_dstat = dstat;
 		np->regdump.nc_sist  = sist;
-	};
+	}
 
 
 	/*----------------------------------------
@@ -5413,7 +5413,7 @@ static void ncr_exception (ncb_p np)
 		OUTB (nc_scr0, HS_UNEXPECTED);
 		OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, cleanup));
 		return;
-	};
+	}
 
 	/*----------------------------------------
 	**	cannot disconnect
@@ -5438,7 +5438,7 @@ static void ncr_exception (ncb_p np)
 			*/
 			device_printf(np->dev, "INFO: LDSC while IID.\n");
 			return;
-		};
+		}
 		device_printf(np->dev, "target %d doesn't release the bus.\n",
 			INB (nc_sdid)&0x0f);
 		/*
@@ -5446,7 +5446,7 @@ static void ncr_exception (ncb_p np)
 		**	timeout will do the real work.
 		*/
 		return;
-	};
+	}
 
 	/*----------------------------------------
 	**	single step
@@ -5458,7 +5458,7 @@ static void ncr_exception (ncb_p np)
 		!(dstat & (MDPE|BF|ABRT|SIR|IID))) {
 		OUTB (nc_dcntl, np->rv_dcntl | STD);
 		return;
-	};
+	}
 
 /*
 **	@RECOVER@ HTH, SGE, ABRT.
@@ -5491,11 +5491,11 @@ static void ncr_exception (ncb_p np)
 			case 12:
 				printf (" ");
 				break;
-			};
+			}
 			val = bus_read_1(np->reg_res, i);
 			printf (" %x%x", val/16, val%16);
 			if (i%16==15) printf (".\n");
-		};
+		}
 
 		callout_stop(&np->timer);
 
@@ -5505,7 +5505,7 @@ static void ncr_exception (ncb_p np)
 		*/
 		OUTB (nc_istat,  SRST);
 		return;
-	};
+	}
 
 #ifdef NCR_FREEZE
 	/*
@@ -5556,7 +5556,7 @@ static void ncr_int_sto (ncb_p np)
 	if (cp) {
 		cp-> host_status = HS_SEL_TIMEOUT;
 		ncr_complete (np, cp);
-	};
+	}
 
 	/*
 	**	repair start queue
@@ -5571,7 +5571,7 @@ static void ncr_int_sto (ncb_p np)
 		WRITESCRIPT(startpos[0], scratcha);
 		OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, start));
 		return;
-	};
+	}
 	ncr_init (np, "selection timeout", HS_FAIL);
 }
 
@@ -5634,7 +5634,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 	if (INB(nc_scntl3) & EWS) {
 		if (ss2 & OLF1) rest++;
 		if (ss2 & ORF1) rest++;
-	};
+	}
 	OUTB (nc_ctest3, np->rv_ctest3 | CLF);	/* clear dma fifo  */
 	OUTB (nc_stest3, TE|CSF);		/* clear scsi fifo */
 
@@ -5682,7 +5682,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 		vdsp_base = np->scripth;
 		vdsp_off = dsp - np->p_scripth - 8;
 		nxtdsp = dsp;
-	};
+	}
 
 	/*
 	**	log the information
@@ -5691,13 +5691,13 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 		printf ("P%x%x ",cmd&7, sbcl&7);
 		printf ("RL=%d D=%d SS0=%x ",
 			(unsigned) rest, (unsigned) delta, ss0);
-	};
+	}
 	if (DEBUG_FLAGS & DEBUG_PHASE) {
 		printf ("\nCP=%p CP2=%p DSP=%x NXT=%x VDSP=%p CMD=%x ",
 			cp, np->header.cp,
 			dsp,
 			nxtdsp, (volatile char*)vdsp_base+vdsp_off, cmd);
-	};
+	}
 
 	/*
 	**	get old startaddress and old length.
@@ -5712,7 +5712,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 	} else {
 		tblp = (u_int32_t *) 0;
 		olen = READSCRIPT_OFF(vdsp_base, vdsp_off) & 0xffffff;
-	};
+	}
 
 	if (DEBUG_FLAGS & DEBUG_PHASE) {
 		printf ("OCMD=%x\nTBLP=%p OLEN=%lx OADR=%lx\n",
@@ -5720,7 +5720,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 			(void *) tblp,
 			(u_long) olen,
 			(u_long) oadr);
-	};
+	}
 
 	/*
 	**	if old phase not dataphase, leave here.
@@ -5742,7 +5742,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 
 		OUTB (nc_dcntl, np->rv_dcntl | STD);
 		return;
-	};
+	}
 
 	/*
 	**	choose the correct patch area.
@@ -5799,12 +5799,12 @@ static int ncr_show_msg (u_char * msg)
 		for (i=1;i<8;i++) {
 			if (i-1>msg[1]) break;
 			printf ("-%x",msg[i]);
-		};
+		}
 		return (i+1);
 	} else if ((*msg & 0xf0) == 0x20) {
 		printf ("-%x",msg[1]);
 		return (2);
-	};
+	}
 	return (1);
 }
 
@@ -5873,7 +5873,7 @@ static void ncr_int_sir (ncb_p np)
 				break;
 			if (DEBUG_FLAGS & DEBUG_RESTART) printf ("- (remove)");
 			tp->hold_cp = cp = (nccb_p) 0;
-		};
+		}
 
 		if (cp) {
 			if (DEBUG_FLAGS & DEBUG_RESTART)
@@ -5881,7 +5881,7 @@ static void ncr_int_sir (ncb_p np)
 			OUTL (nc_dsa, CCB_PHYS (cp, phys));
 			OUTL (nc_dsp, NCB_SCRIPTH_PHYS (np, getcc));
 			return;
-		};
+		}
 
 		/*
 		**	no job, resume normal processing
@@ -6001,7 +6001,7 @@ static void ncr_int_sir (ncb_p np)
 			PRINT_ADDR(cp->ccb);
 			printf ("negotiation failed sir=%x status=%x.\n",
 				num, cp->nego_status);
-		};
+		}
 
 		/*
 		**	any error in negotiation:
@@ -6017,7 +6017,7 @@ static void ncr_int_sir (ncb_p np)
 			ncr_setwide (np, cp, 0, 0);
 			break;
 
-		};
+		}
 		np->msgin [0] = MSG_NOOP;
 		np->msgout[0] = MSG_NOOP;
 		cp->nego_status = 0;
@@ -6034,7 +6034,7 @@ static void ncr_int_sir (ncb_p np)
 			printf ("sync msgin: ");
 			(void) ncr_show_msg (np->msgin);
 			printf (".\n");
-		};
+		}
 
 		/*
 		**	get requested values.
@@ -6100,14 +6100,14 @@ static void ncr_int_sir (ncb_p np)
 					*/
 					ncr_setsync (np,cp,scntl3,(fak<<5)|ofs, per);
 					OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, clrack));
-				};
+				}
 				return;
 
 			case NS_WIDE:
 				ncr_setwide (np, cp, 0, 0);
 				break;
-			};
-		};
+			}
+		}
 
 		/*
 		**	It was a request. Set value and
@@ -6148,7 +6148,7 @@ static void ncr_int_sir (ncb_p np)
 			printf ("wide msgin: ");
 			(void) ncr_show_msg (np->msgin);
 			printf (".\n");
-		};
+		}
 
 		/*
 		**	get requested values.
@@ -6189,14 +6189,14 @@ static void ncr_int_sir (ncb_p np)
 					*/
 					ncr_setwide (np, cp, wide, 1);
 					OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, clrack));
-				};
+				}
 				return;
 
 			case NS_SYNC:
 				ncr_setsync (np, cp, 0, 0xe0, 0);
 				break;
-			};
-		};
+			}
+		}
 
 		/*
 		**	It was a request, set value and
@@ -6338,7 +6338,7 @@ static void ncr_int_sir (ncb_p np)
 			*/
 			OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, reselect));
 			return;
-		};
+		}
 
 		/*
 		**	else remove the interrupt.
@@ -6347,7 +6347,7 @@ static void ncr_int_sir (ncb_p np)
 		device_printf(np->dev, "queue empty.\n");
 		WRITESCRIPT(start1[0], SCR_INT ^ IFFALSE (0));
 		break;
-	};
+	}
 
 out:
 	OUTB (nc_dcntl, np->rv_dcntl | STD);
@@ -6643,7 +6643,7 @@ static	int	ncr_scatter
 			csize   -= size;
 			datalen -= size;
 			paddr    = vtophys (vaddr);
-		};
+		}
 
 		if(DEBUG_FLAGS & DEBUG_SCATTER)
 			printf ("\tseg #%d  addr=%x  size=%d  (rest=%d).\n",
@@ -6661,7 +6661,7 @@ static	int	ncr_scatter
 		printf("ncr?: scatter/gather failed (residue=%d).\n",
 			(unsigned) datalen);
 		return (-1);
-	};
+	}
 
 	return (segment);
 }
@@ -6697,7 +6697,7 @@ static int ncr_regtest (struct ncb* np)
 		printf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n",
 			(unsigned) data);
 		return (0x10);
-	};
+	}
 	return (0);
 }
 #endif
@@ -6753,7 +6753,7 @@ static int ncr_snooptest (struct ncb* np)
 	if (i>=NCR_SNOOP_TIMEOUT) {
 		printf ("CACHE TEST FAILED: timeout.\n");
 		return (0x20);
-	};
+	}
 	/*
 	**	Check termination position.
 	*/
@@ -6763,7 +6763,7 @@ static int ncr_snooptest (struct ncb* np)
 			(u_long) NCB_SCRIPTH_PHYS (np, snooptest), (u_long) pc,
 			(u_long) NCB_SCRIPTH_PHYS (np, snoopend) +8);
 		return (0x40);
-	};
+	}
 	/*
 	**	Show results.
 	*/
@@ -6771,17 +6771,17 @@ static int ncr_snooptest (struct ncb* np)
 		printf ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n",
 			(int) host_wr, (int) ncr_rd);
 		err |= 1;
-	};
+	}
 	if (host_rd != ncr_wr) {
 		printf ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n",
 			(int) ncr_wr, (int) host_rd);
 		err |= 2;
-	};
+	}
 	if (ncr_bk != ncr_wr) {
 		printf ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n",
 			(int) ncr_wr, (int) ncr_bk);
 		err |= 4;
-	};
+	}
 	return (err);
 }
 
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index 0a37079..58fee0b 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -2590,7 +2590,7 @@ nfe_setmulti(struct nfe_softc *sc)
 		bzero(addr, ETHER_ADDR_LEN);
 		bzero(mask, ETHER_ADDR_LEN);
 		goto done;
-	};
+	}
 
 	if_multiaddr_array(ifp, mta, &mcnt, mc_count);
 
diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index 01bd4cf..cb2ae81 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -2113,7 +2113,7 @@ oce_get_profile_config(POCE_SOFTC sc, uint32_t max_rss)
 			sc->nrssqs = MIN(sc->nrssqs, max_rss);
 		else
 			sc->nrssqs = max_rss;
-		sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */;
+		sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */
 
 	}
 error:
@@ -2213,7 +2213,7 @@ oce_get_func_config(POCE_SOFTC sc)
 			sc->nrssqs = MIN(sc->nrssqs, max_rss);
 		else
 			sc->nrssqs = max_rss;
-		sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */;
+		sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */
 	}
 error:
 	oce_dma_free(sc, &dma);
diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c
index 3df7d0d..61adf93 100644
--- a/sys/dev/oce/oce_sysctl.c
+++ b/sys/dev/oce/oce_sysctl.c
@@ -331,7 +331,7 @@ static void oce_fill_flash_img_data(POCE_SOFTC sc, const struct flash_sec_info *
 		case IMG_PXEBIOS:
 			pimg->optype = 3;
 			if (IS_BE3(sc)) {
-				pimg->img_offset =  13107200;;
+				pimg->img_offset =  13107200;
 				pimg->img_size   = 524288;
 			}
 			break;
diff --git a/sys/dev/ow/ow.c b/sys/dev/ow/ow.c
index ea78890..f5b5c6b 100644
--- a/sys/dev/ow/ow.c
+++ b/sys/dev/ow/ow.c
@@ -413,7 +413,7 @@ again:
 		foundfp(dev, probed);
 		last_mask = probed;
 		prior = last;
-	};
+	}
 	ow_release_bus(dev, dev);
 
 	return (0);
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index ed48bda..29a2a87 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -189,7 +189,7 @@ patm_attach(device_t dev)
 	IFP2IFATM(sc->ifp)->mib.hw_version = 0;
 	IFP2IFATM(sc->ifp)->mib.sw_version = 0;
 	IFP2IFATM(sc->ifp)->mib.vpi_bits = PATM_VPI_BITS;
-	IFP2IFATM(sc->ifp)->mib.vci_bits = 0;	/* set below */;
+	IFP2IFATM(sc->ifp)->mib.vci_bits = 0;	/* set below */
 	IFP2IFATM(sc->ifp)->mib.max_vpcs = 0;
 	IFP2IFATM(sc->ifp)->mib.max_vccs = 0;	/* set below */
 	IFP2IFATM(sc->ifp)->mib.media = IFM_ATM_UNKNOWN;
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index f9252b5..cf2b65d 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -466,7 +466,7 @@ pcf_read(device_t dev, char *buf, int len, int *read, int last,
 
 		len --;
 		bytes ++;
-	};
+	}
 
 error:
 	*read = bytes;
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 2f44439..4fb98db 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -1291,7 +1291,7 @@ pdq_stop(
     pdq->pdq_intrmask = 0;
       /* PDQ_HOST_INT_STATE_CHANGE
 	|PDQ_HOST_INT_FATAL_ERROR|PDQ_HOST_INT_CMD_RSP_ENABLE
-	|PDQ_HOST_INT_UNSOL_ENABLE */;
+	|PDQ_HOST_INT_UNSOL_ENABLE */
     PDQ_CSR_WRITE(csrs, csr_host_int_enable, pdq->pdq_intrmask);
 
     /*
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 3ae3f38..bbe774b 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -3434,7 +3434,7 @@ qla_iscsi_pdu(qla_host_t *ha, struct mbuf *mp)
 			offset = hdrlen + 4;
 	
 			if (mp->m_len >= offset) {
-				th = (struct tcphdr *)(mp->m_data + hdrlen);;
+				th = (struct tcphdr *)(mp->m_data + hdrlen);
 			} else {
                                 m_copydata(mp, hdrlen, 4, buf);
 				th = (struct tcphdr *)buf;
@@ -3458,7 +3458,7 @@ qla_iscsi_pdu(qla_host_t *ha, struct mbuf *mp)
 			offset = hdrlen + 4;
 
 			if (mp->m_len >= offset) {
-				th = (struct tcphdr *)(mp->m_data + hdrlen);;
+				th = (struct tcphdr *)(mp->m_data + hdrlen);
 			} else {
 				m_copydata(mp, hdrlen, 4, buf);
 				th = (struct tcphdr *)buf;
diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c
index 8bfb00d..c50c14d 100644
--- a/sys/dev/ral/rt2860.c
+++ b/sys/dev/ral/rt2860.c
@@ -3448,7 +3448,7 @@ rt2860_read_eeprom(struct rt2860_softc *sc, uint8_t macaddr[IEEE80211_ADDR_LEN])
 		sc->ext_5ghz_lna = (val >> 3) & 1;
 		sc->ext_2ghz_lna = (val >> 2) & 1;
 		/* check if RF supports automatic Tx access gain control */
-		sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */;
+		sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */
 		/* check if we have a hardware radio switch */
 		sc->rfswitch = val & 1;
 	}
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index ff08748..fd042fe 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -460,7 +460,7 @@ rt_attach(device_t dev)
 		sc->rx_drx_idx[0]=PDMA_BASE+RX_DRX_IDX0;
 		sc->int_rx_done_mask=INT_RX_DONE;
 		sc->int_tx_done_mask=INT_TXQ0_DONE;
-	};
+	}
 
 	/* allocate Tx and Rx rings */
 	for (i = 0; i < RT_SOFTC_TX_RING_COUNT; i++) {
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index e741dd0d..71f7772 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -669,7 +669,7 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
 	         * from a previous session
 	         */
 		MIDIQ_CLEAR(m->inq);
-	};
+	}
 
 	if (flags & FWRITE)
 		m->flags |= M_TX;
@@ -1126,7 +1126,7 @@ midisynth_open(void *n, void *arg, int flags)
 	         */
 		MIDIQ_CLEAR(m->inq);
 		m->rchan = 0;
-	};
+	}
 
 	if (flags & FWRITE) {
 		m->flags |= M_TX;
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index a1b9f7c..b4c021b 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -779,7 +779,7 @@ hdaa_sense_init(struct hdaa_devinfo *devinfo)
 					    (w->unsol < 0) ? "polling" :
 					    "unsolicited responses");
 				);
-			};
+			}
 		}
 		hdaa_presence_handler(w);
 		if (!HDA_PARAM_PIN_CAP_DP(w->wclass.pin.cap) &&
@@ -847,7 +847,7 @@ hdaa_widget_pin_patch(uint32_t config, const char *str)
 			if (bad[0] == 0) {
 				config |= ((ival << HDA_CONFIG_DEFAULTCONF_COLOR_SHIFT) &
 				    HDA_CONFIG_DEFAULTCONF_COLOR_MASK);
-			};
+			}
 			for (i = 0; i < 16; i++) {
 				if (strcasecmp(HDA_COLORS[i], value) == 0) {
 					config |= (i << HDA_CONFIG_DEFAULTCONF_COLOR_SHIFT);
@@ -872,7 +872,7 @@ hdaa_widget_pin_patch(uint32_t config, const char *str)
 				config |= ((ival << HDA_CONFIG_DEFAULTCONF_DEVICE_SHIFT) &
 				    HDA_CONFIG_DEFAULTCONF_DEVICE_MASK);
 				continue;
-			};
+			}
 			for (i = 0; i < 16; i++) {
 				if (strcasecmp(HDA_DEVS[i], value) == 0) {
 					config |= (i << HDA_CONFIG_DEFAULTCONF_DEVICE_SHIFT);
@@ -898,7 +898,7 @@ hdaa_widget_pin_patch(uint32_t config, const char *str)
 				config |= ((ival << HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_SHIFT) &
 				    HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK);
 				continue;
-			};
+			}
 			for (i = 0; i < 4; i++) {
 				if (strcasecmp(HDA_CONNS[i], value) == 0) {
 					config |= (i << HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_SHIFT);
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 491aa54..43a0e9d 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -2025,7 +2025,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
 			MDELAY (10000);
 			++cur;
 			continue;
-		};
+		}
 
 		/*
 		 *  We use the bogus value 0xf00ff00f ;-)
@@ -2114,7 +2114,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
 		default:
 			relocs = 0;
 			break;
-		};
+		}
 
 		/*
 		 *  Scriptify:) the opcode.
@@ -2170,7 +2170,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
 
 			*cur++ = cpu_to_scr(new);
 		}
-	};
+	}
 }
 
 /*---------------------------------------------------------------------------*/
@@ -2867,7 +2867,7 @@ static int sym_prepare_nego(hcb_p np, ccb_p cp, int nego, u_char *msgptr)
 		msgptr[msglen++] = tp->tinfo.goal.width;
 		msgptr[msglen++] = tp->tinfo.goal.options & PPR_OPT_DT;
 		break;
-	};
+	}
 
 	cp->nego_status = nego;
 
@@ -2877,8 +2877,8 @@ static int sym_prepare_nego(hcb_p np, ccb_p cp, int nego, u_char *msgptr)
 			sym_print_msg(cp, nego == NS_SYNC ? "sync msgout" :
 					  nego == NS_WIDE ? "wide msgout" :
 					  "ppr msgout", msgptr);
-		};
-	};
+		}
+	}
 
 	return msglen;
 }
@@ -3827,7 +3827,7 @@ static void sym_intr1 (hcb_p np)
 		istat = INB (nc_istat);		/* DUMMY READ */
 		if (DEBUG_FLAGS & DEBUG_TINY) printf ("F ");
 		(void)sym_wakeup_done (np);
-	};
+	}
 
 	if (!(istat & (SIP|DIP)))
 		return;
@@ -3892,7 +3892,7 @@ static void sym_intr1 (hcb_p np)
 		else if (dstat & SSI)	OUTONB_STD ();
 		else			goto unknown_int;
 		return;
-	};
+	}
 
 	/*
 	 *  Now, interrupts that donnot happen in normal
@@ -3910,7 +3910,7 @@ static void sym_intr1 (hcb_p np)
 		printf("SCSI BUS reset detected.\n");
 		sym_init (np, 1);
 		return;
-	};
+	}
 
 	OUTB (nc_ctest3, np->rv_ctest3 | CLF);	/* clear dma fifo  */
 	OUTB (nc_stest3, TE|CSF);		/* clear scsi fifo */
@@ -3922,7 +3922,7 @@ static void sym_intr1 (hcb_p np)
 		else if (sist & UDC)	sym_int_udc (np);
 		else			goto unknown_int;
 		return;
-	};
+	}
 
 	/*
 	 *  Now, interrupts we are not able to recover cleanly.
@@ -3937,7 +3937,7 @@ static void sym_intr1 (hcb_p np)
 		(dstat & (MDPE|BF|ABRT|IID))) {
 		sym_start_reset(np);
 		return;
-	};
+	}
 
 unknown_int:
 	/*
@@ -4274,7 +4274,7 @@ static void sym_int_ma (hcb_p np)
 			if (ss2 & OLF1) rest++;
 			if (!(np->features & FE_C10))
 				if (ss2 & ORF1) rest++;
-		};
+		}
 
 		/*
 		 *  Clear fifos.
@@ -4313,7 +4313,7 @@ static void sym_int_ma (hcb_p np)
 	if (DEBUG_FLAGS & DEBUG_PHASE) {
 		printf ("\nCP=%p DSP=%x NXT=%x VDSP=%p CMD=%x ",
 			cp, (unsigned)dsp, (unsigned)nxtdsp, vdsp, cmd);
-	};
+	}
 
 	if (!vdsp) {
 		printf ("%s: interrupted SCRIPT address not found.\n",
@@ -4339,7 +4339,7 @@ static void sym_int_ma (hcb_p np)
 	} else {
 		tblp = (u32 *) 0;
 		olen = scr_to_cpu(vdsp[0]) & 0xffffff;
-	};
+	}
 
 	if (DEBUG_FLAGS & DEBUG_PHASE) {
 		printf ("OCMD=%x\nTBLP=%p OLEN=%x OADR=%x\n",
@@ -4347,7 +4347,7 @@ static void sym_int_ma (hcb_p np)
 			tblp,
 			(unsigned) olen,
 			(unsigned) oadr);
-	};
+	}
 
 	/*
 	 *  check cmd against assumed interrupted script command.
@@ -4360,7 +4360,7 @@ static void sym_int_ma (hcb_p np)
 			(unsigned)cmd, (unsigned)scr_to_cpu(vdsp[0]) >> 24);
 
 		goto reset_all;
-	};
+	}
 
 	/*
 	 *  if old phase not dataphase, leave here.
@@ -4371,7 +4371,7 @@ static void sym_int_ma (hcb_p np)
 			cmd&7, INB(nc_sbcl)&7, (unsigned)olen,
 			(unsigned)oadr, (unsigned)rest);
 		goto unexpected_phase;
-	};
+	}
 
 	/*
 	 *  Choose the correct PM save area.
@@ -5541,12 +5541,12 @@ static int sym_show_msg (u_char * msg)
 		for (i=1;i<8;i++) {
 			if (i-1>msg[1]) break;
 			printf ("-%x",msg[i]);
-		};
+		}
 		return (i+1);
 	} else if ((*msg & 0xf0) == 0x20) {
 		printf ("-%x",msg[1]);
 		return (2);
-	};
+	}
 	return (1);
 }
 
@@ -5607,7 +5607,7 @@ static void sym_sync_nego(hcb_p np, tcb_p tp, ccb_p cp)
 	 */
 	if (DEBUG_FLAGS & DEBUG_NEGO) {
 		sym_print_msg(cp, "sync msgin", np->msgin);
-	};
+	}
 
 	/*
 	 * request or answer ?
@@ -5708,7 +5708,7 @@ static void sym_ppr_nego(hcb_p np, tcb_p tp, ccb_p cp)
 	 */
 	if (DEBUG_FLAGS & DEBUG_NEGO) {
 		sym_print_msg(cp, "ppr msgin", np->msgin);
-	};
+	}
 
 	/*
 	 *  get requested values.
@@ -5847,7 +5847,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
 	 */
 	if (DEBUG_FLAGS & DEBUG_NEGO) {
 		sym_print_msg(cp, "wide msgin", np->msgin);
-	};
+	}
 
 	/*
 	 * Is it a request from the device?
@@ -5912,7 +5912,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
 
 		OUTL_DSP (SCRIPTA_BA (np, clrack));
 		return;
-	};
+	}
 
 	/*
 	 *  It was a request, set value and
@@ -5972,7 +5972,7 @@ static void sym_nego_default(hcb_p np, tcb_p tp, ccb_p cp)
 	case NS_WIDE:
 		sym_setwide (np, cp, 0);
 		break;
-	};
+	}
 	np->msgin [0] = M_NOOP;
 	np->msgout[0] = M_NOOP;
 	cp->nego_status = 0;
@@ -6237,7 +6237,7 @@ static void sym_int_sir (hcb_p np)
 	case SIR_NEGO_PROTO:
 		sym_nego_default(np, tp, cp);
 		goto out;
-	};
+	}
 
 out:
 	OUTONB_STD ();
@@ -6719,7 +6719,7 @@ static int sym_regtest (hcb_p np)
 		printf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n",
 			(unsigned) data);
 		return (0x10);
-	};
+	}
 	return (0);
 }
 #endif
@@ -6763,7 +6763,7 @@ restart_test:
 	if (i>=SYM_SNOOP_TIMEOUT) {
 		printf ("CACHE TEST FAILED: timeout.\n");
 		return (0x20);
-	};
+	}
 	/*
 	 *  Check for fatal DMA errors.
 	 */
@@ -6801,7 +6801,7 @@ restart_test:
 			(u_long) SCRIPTB0_BA (np, snooptest), (u_long) pc,
 			(u_long) SCRIPTB0_BA (np, snoopend) +8);
 		return (0x40);
-	};
+	}
 	/*
 	 *  Show results.
 	 */
@@ -6809,17 +6809,17 @@ restart_test:
 		printf ("CACHE TEST FAILED: host wrote %d, chip read %d.\n",
 			(int) host_wr, (int) sym_rd);
 		err |= 1;
-	};
+	}
 	if (host_rd != sym_wr) {
 		printf ("CACHE TEST FAILED: chip wrote %d, host read %d.\n",
 			(int) sym_wr, (int) host_rd);
 		err |= 2;
-	};
+	}
 	if (sym_bk != sym_wr) {
 		printf ("CACHE TEST FAILED: chip wrote %d, read back %d.\n",
 			(int) sym_wr, (int) sym_bk);
 		err |= 4;
-	};
+	}
 
 	return (err);
 }
@@ -8734,7 +8734,7 @@ sym_pci_attach(device_t dev)
 	if (sym_snooptest (np)) {
 		device_printf(dev, "CACHE INCORRECTLY CONFIGURED.\n");
 		goto attach_failed;
-	};
+	}
 
 	/*
 	 *  Now deal with CAM.
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 918857a..be42375 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -127,7 +127,7 @@ tdfx_probe(device_t dev)
 	case PCI_DEVICE_3DFX_VOODOO1:
 		device_set_desc(dev, "3DFX Voodoo Graphics 3D Accelerator");
 		return BUS_PROBE_DEFAULT;
-	};
+	}
 
 	return ENXIO;
 }
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index eba7f7b..23ed50b 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1720,7 +1720,7 @@ ti_init_rx_ring_std(struct ti_softc *sc)
 	for (i = 0; i < TI_STD_RX_RING_CNT; i++) {
 		if (ti_newbuf_std(sc, i) != 0)
 			return (ENOBUFS);
-	};
+	}
 
 	sc->ti_std = TI_STD_RX_RING_CNT - 1;
 	TI_UPDATE_STDPROD(sc, TI_STD_RX_RING_CNT - 1);
@@ -1758,7 +1758,7 @@ ti_init_rx_ring_jumbo(struct ti_softc *sc)
 	for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
 		if (ti_newbuf_jumbo(sc, i, NULL) != 0)
 			return (ENOBUFS);
-	};
+	}
 
 	sc->ti_jumbo = TI_JUMBO_RX_RING_CNT - 1;
 	TI_UPDATE_JUMBOPROD(sc, TI_JUMBO_RX_RING_CNT - 1);
@@ -1795,7 +1795,7 @@ ti_init_rx_ring_mini(struct ti_softc *sc)
 	for (i = 0; i < TI_MINI_RX_RING_CNT; i++) {
 		if (ti_newbuf_mini(sc, i) != 0)
 			return (ENOBUFS);
-	};
+	}
 
 	sc->ti_mini = TI_MINI_RX_RING_CNT - 1;
 	TI_UPDATE_MINIPROD(sc, TI_MINI_RX_RING_CNT - 1);
diff --git a/sys/dev/uart/uart_dev_msm.c b/sys/dev/uart/uart_dev_msm.c
index 7ba46ac..cfd2330 100644
--- a/sys/dev/uart/uart_dev_msm.c
+++ b/sys/dev/uart/uart_dev_msm.c
@@ -123,7 +123,7 @@ msm_uart_param(struct uart_bas *bas, int baudrate, int databits,
 	}
 	uart_setreg(bas, UART_DM_MR2, ulcon);
 
-	/* Set 115200 for both TX and RX. */;
+	/* Set 115200 for both TX and RX. */
 	uart_setreg(bas, UART_DM_CSR, UART_DM_CSR_115200);
 	uart_barrier(bas);
 
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 1f92629..3a65ec6 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -608,7 +608,7 @@ mos_setmulti(struct usb_ether *ue)
 		if (ifma->ifma_addr->sa_family != AF_LINK) {
 			allmulti = 1;
 			continue;
-		};
+		}
 		h = ether_crc32_be(LLADDR((struct sockaddr_dl *)
 		    ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
 		hashtbl[h / 8] |= 1 << (h % 8);
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 4d215f8..9d7f47a 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -419,7 +419,7 @@ ure_probe(device_t dev)
 {
 	struct usb_attach_arg *uaa;
 
-	uaa = device_get_ivars(dev);;
+	uaa = device_get_ivars(dev);
 	if (uaa->usb_mode != USB_MODE_HOST)
 		return (ENXIO);
 	if (uaa->info.bConfigIndex != URE_CONFIG_IDX)
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 40be782..2884c57 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -709,7 +709,7 @@ vt_machine_kbdevent(int c)
 		/* Suspend machine. */
 		power_pm_suspend(POWER_SLEEP_STATE_SUSPEND);
 		return (1);
-	};
+	}
 
 	return (0);
 }