MFC r303891, r303892:

sys: replace comma with semicolon when pertinent.

Uses of commas instead of a semicolons can easily go undetected. The comma
can serve as a statement separator but this shouldn't be abused when
statements are meant to be standalone.

12 files changed, 30 insertions, 30 deletions

diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c
index 217cfc8..10089a0 100644
--- a/sys/arm/xscale/ixp425/avila_ata.c
+++ b/sys/arm/xscale/ixp425/avila_ata.c
@@ -202,17 +202,17 @@ ata_avila_attach(device_t dev)
 		 */
 		sc->sc_expbus_tag.bs_privdata = sc;	/* NB: backpointer */
 		/* read single */
-		sc->sc_expbus_tag.bs_r_1	= ata_bs_r_1,
-		sc->sc_expbus_tag.bs_r_2	= ata_bs_r_2,
+		sc->sc_expbus_tag.bs_r_1	= ata_bs_r_1;
+		sc->sc_expbus_tag.bs_r_2	= ata_bs_r_2;
 		/* read multiple */
-		sc->sc_expbus_tag.bs_rm_2	= ata_bs_rm_2,
-		sc->sc_expbus_tag.bs_rm_2_s	= ata_bs_rm_2_s,
+		sc->sc_expbus_tag.bs_rm_2	= ata_bs_rm_2;
+		sc->sc_expbus_tag.bs_rm_2_s	= ata_bs_rm_2_s;
 		/* write (single) */
-		sc->sc_expbus_tag.bs_w_1	= ata_bs_w_1,
-		sc->sc_expbus_tag.bs_w_2	= ata_bs_w_2,
+		sc->sc_expbus_tag.bs_w_1	= ata_bs_w_1;
+		sc->sc_expbus_tag.bs_w_2	= ata_bs_w_2;
 		/* write multiple */
-		sc->sc_expbus_tag.bs_wm_2	= ata_bs_wm_2,
-		sc->sc_expbus_tag.bs_wm_2_s	= ata_bs_wm_2_s,
+		sc->sc_expbus_tag.bs_wm_2	= ata_bs_wm_2;
+		sc->sc_expbus_tag.bs_wm_2_s	= ata_bs_wm_2_s;
 
 		rman_set_bustag(&sc->sc_ata, &sc->sc_expbus_tag);
 		rman_set_bustag(&sc->sc_alt_ata, &sc->sc_expbus_tag);
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c
index 533ad3f..c470394 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/sys/boot/i386/zfsboot/zfsboot.c
@@ -465,7 +465,7 @@ main(void)
     bootinfo.bi_bios_dev = dsk->drive;
 
     bootdev = MAKEBOOTDEV(dev_maj[dsk->type],
-			  dsk->slice, dsk->unit, dsk->part),
+			  dsk->slice, dsk->unit, dsk->part);
 
     /* Process configuration file */
 
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 6c04fae..0487441 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -8442,7 +8442,7 @@ scsi_read_attribute(struct ccb_scsiio *csio, u_int32_t retries,
 	bzero(scsi_cmd, sizeof(*scsi_cmd));
 
 	scsi_cmd->opcode = READ_ATTRIBUTE;
-	scsi_cmd->service_action = service_action,
+	scsi_cmd->service_action = service_action;
 	scsi_ulto2b(element, scsi_cmd->element);
 	scsi_cmd->elem_type = elem_type;
 	scsi_cmd->logical_volume = logical_volume;
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index a51177c9..141cac1 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -130,7 +130,7 @@ aic7770_map_registers(struct ahc_softc *ahc, u_int unused_ioport_arg)
 		return ENOMEM;
 	}
 	ahc->platform_data->regs_res_type = SYS_RES_IOPORT;
-	ahc->platform_data->regs_res_id = rid,
+	ahc->platform_data->regs_res_id = rid;
 	ahc->platform_data->regs = regs;
 	ahc->tag = rman_get_bustag(regs);
 	ahc->bsh = rman_get_bushandle(regs);
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
index e0af27c..c6b3b99 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
@@ -270,8 +270,8 @@ ar5212InitState(struct ath_hal_5212 *ahp, uint16_t devid, HAL_SOFTC sc,
 	ahp->ah_acktimeout = (u_int) -1;
 	ahp->ah_ctstimeout = (u_int) -1;
 	ahp->ah_sifstime = (u_int) -1;
-	ahp->ah_txTrigLev = INIT_TX_FIFO_THRESHOLD,
-	ahp->ah_maxTxTrigLev = MAX_TX_FIFO_THRESHOLD,
+	ahp->ah_txTrigLev = INIT_TX_FIFO_THRESHOLD;
+	ahp->ah_maxTxTrigLev = MAX_TX_FIFO_THRESHOLD;
 
 	OS_MEMCPY(&ahp->ah_bssidmask, defbssidmask, IEEE80211_ADDR_LEN);
 #undef N
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
index 99bab06..b5ac9a8 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
@@ -103,8 +103,8 @@ ar5416InitState(struct ath_hal_5416 *ahp5416, uint16_t devid, HAL_SOFTC sc,
 	ah->ah_configPCIE		= ar5416ConfigPCIE;
 	ah->ah_disablePCIE		= ar5416DisablePCIE;
 	ah->ah_perCalibration		= ar5416PerCalibration;
-	ah->ah_perCalibrationN		= ar5416PerCalibrationN,
-	ah->ah_resetCalValid		= ar5416ResetCalValid,
+	ah->ah_perCalibrationN		= ar5416PerCalibrationN;
+	ah->ah_resetCalValid		= ar5416ResetCalValid;
 	ah->ah_setTxPowerLimit		= ar5416SetTxPowerLimit;
 	ah->ah_setTxPower		= ar5416SetTransmitPower;
 	ah->ah_setBoardValues		= ar5416SetBoardValues;
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 02ec2e7..b37f6c8 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -13370,7 +13370,7 @@ bxe_get_shmem_info(struct bxe_softc *sc)
 
     /* get the port feature config */
     sc->port.config =
-        SHMEM_RD(sc, dev_info.port_feature_config[port].config),
+        SHMEM_RD(sc, dev_info.port_feature_config[port].config);
 
     /* get the link params */
     sc->link_params.speed_cap_mask[0] =
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
index cfe8323..58c9d7e 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -84,7 +84,7 @@ ip17x_probe(device_t dev)
 	phy_id1 = MDIO_READREG(device_get_parent(dev), 0, MII_PHYIDR1);
 	phy_id2 = MDIO_READREG(device_get_parent(dev), 0, MII_PHYIDR2);
 
-	oui = MII_OUI(phy_id1, phy_id2),
+	oui = MII_OUI(phy_id1, phy_id2);
 	model = MII_MODEL(phy_id2);
 	/* We only care about IC+ devices. */
 	if (oui != IP17X_OUI) {
diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c
index 301032e..272ed24 100644
--- a/sys/dev/usb/controller/ehci_ixp4xx.c
+++ b/sys/dev/usb/controller/ehci_ixp4xx.c
@@ -134,13 +134,13 @@ ehci_ixp_attach(device_t self)
 	isc->iot = rman_get_bustag(sc->sc_io_res);
 	isc->tag.bs_privdata = isc->iot;
 	/* read single */
-	isc->tag.bs_r_1	= ehci_bs_r_1,
-	isc->tag.bs_r_2	= ehci_bs_r_2,
-	isc->tag.bs_r_4	= ehci_bs_r_4,
+	isc->tag.bs_r_1	= ehci_bs_r_1;
+	isc->tag.bs_r_2	= ehci_bs_r_2;
+	isc->tag.bs_r_4	= ehci_bs_r_4;
 	/* write (single) */
-	isc->tag.bs_w_1	= ehci_bs_w_1,
-	isc->tag.bs_w_2	= ehci_bs_w_2,
-	isc->tag.bs_w_4	= ehci_bs_w_4,
+	isc->tag.bs_w_1	= ehci_bs_w_1;
+	isc->tag.bs_w_2	= ehci_bs_w_2;
+	isc->tag.bs_w_4	= ehci_bs_w_4;
 
 	sc->sc_io_tag = &isc->tag;
 	sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 07c1797..fc08e88 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -419,7 +419,7 @@ wep_decrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen)
 	}
 
 	off = hdrlen + wep.ic_header;
-	data_len = m->m_pkthdr.len - (off + wep.ic_trailer),
+	data_len = m->m_pkthdr.len - (off + wep.ic_trailer);
 
 	/* Compute CRC32 over unencrypted data and apply RC4 to data */
 	crc = ~0;
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c
index be0c64b..7f3b444d 100644
--- a/sys/sparc64/pci/fire.c
+++ b/sys/sparc64/pci/fire.c
@@ -741,11 +741,11 @@ fire_attach(device_t dev)
 	    "DLU/TLU correctable errors");
 	FIRE_SYSCTL_ADD_UINT("tlu_oe_non_fatal",
 	    &sc->sc_stats_tlu_oe_non_fatal,
-	    "DLU/TLU other event non-fatal errors summary"),
+	    "DLU/TLU other event non-fatal errors summary");
 	FIRE_SYSCTL_ADD_UINT("tlu_oe_rx_err", &sc->sc_stats_tlu_oe_rx_err,
-	    "DLU/TLU receive other event errors"),
+	    "DLU/TLU receive other event errors");
 	FIRE_SYSCTL_ADD_UINT("tlu_oe_tx_err", &sc->sc_stats_tlu_oe_tx_err,
-	    "DLU/TLU transmit other event errors"),
+	    "DLU/TLU transmit other event errors");
 	FIRE_SYSCTL_ADD_UINT("ubc_dmardue", &sc->sc_stats_ubc_dmardue,
 	    "UBC DMARDUE erros");
 
diff --git a/sys/x86/cpufreq/powernow.c b/sys/x86/cpufreq/powernow.c
index cc62e87..13ec9d8 100644
--- a/sys/x86/cpufreq/powernow.c
+++ b/sys/x86/cpufreq/powernow.c
@@ -700,9 +700,9 @@ pn_decode_pst(device_t dev)
 			if (sc->pn_type != PN8_TYPE)
 				return (EINVAL);
 			sc->vst = psb->settlingtime;
-			sc->rvo = PN8_PSB_TO_RVO(psb->res1),
-			sc->irt = PN8_PSB_TO_IRT(psb->res1),
-			sc->mvs = PN8_PSB_TO_MVS(psb->res1),
+			sc->rvo = PN8_PSB_TO_RVO(psb->res1);
+			sc->irt = PN8_PSB_TO_IRT(psb->res1);
+			sc->mvs = PN8_PSB_TO_MVS(psb->res1);
 			sc->low = PN8_PSB_TO_BATT(psb->res1);
 			if (bootverbose) {
 				device_printf(dev, "PSB: VST: %d\n",