svn commit: r303891 - in head/sys/dev: aic7xxx ath/ath_hal/ar5212 ath/ath_hal/ar5416 bxe etherswitch/ip17x usb/controller

[Pedro F. Giffuni]

Author: pfg
Date: Tue Aug  9 19:41:46 2016
New Revision: 303891
URL: https://svnweb.freebsd.org/changeset/base/303891

Log:
  sys/dev: 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.
  
  Detected with devel/coccinelle following a hint from DragonFlyBSD.
  
  MFC after:	1 month

Modified:
  head/sys/dev/aic7xxx/aic7xxx_osm.c
  head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  head/sys/dev/bxe/bxe.c
  head/sys/dev/etherswitch/ip17x/ip17x.c
  head/sys/dev/usb/controller/ehci_ixp4xx.c

Modified: head/sys/dev/aic7xxx/aic7xxx_osm.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx_osm.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/aic7xxx/aic7xxx_osm.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -130,7 +130,7 @@ aic7770_map_registers(struct ahc_softc *
 		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);

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -270,8 +270,8 @@ ar5212InitState(struct ath_hal_5212 *ahp
 	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

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -103,8 +103,8 @@ ar5416InitState(struct ath_hal_5416 *ahp
 	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;

Modified: head/sys/dev/bxe/bxe.c
==============================================================================
--- head/sys/dev/bxe/bxe.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/bxe/bxe.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -13332,7 +13332,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] =

Modified: head/sys/dev/etherswitch/ip17x/ip17x.c
==============================================================================
--- head/sys/dev/etherswitch/ip17x/ip17x.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/etherswitch/ip17x/ip17x.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -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) {

Modified: head/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_ixp4xx.c	Tue Aug  9 19:32:06 2016	(r303890)
+++ head/sys/dev/usb/controller/ehci_ixp4xx.c	Tue Aug  9 19:41:46 2016	(r303891)
@@ -147,13 +147,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);