Date: Thu, 8 Sep 2016 15:06:28 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r305615 - in stable/10/sys: arm/xscale/ixp425 boot/i386/zfsboot cam/scsi dev/aic7xxx dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5416 dev/bxe dev/etherswitch/ip17x dev/usb/controller net80... Message-ID: <201609081506.u88F6SE7087152@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Sep 8 15:06:28 2016 New Revision: 305615 URL: https://svnweb.freebsd.org/changeset/base/305615 Log: 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. Modified: stable/10/sys/arm/xscale/ixp425/avila_ata.c stable/10/sys/boot/i386/zfsboot/zfsboot.c stable/10/sys/cam/scsi/scsi_all.c stable/10/sys/dev/aic7xxx/aic7xxx_osm.c stable/10/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c stable/10/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c stable/10/sys/dev/bxe/bxe.c stable/10/sys/dev/etherswitch/ip17x/ip17x.c stable/10/sys/dev/usb/controller/ehci_ixp4xx.c stable/10/sys/net80211/ieee80211_crypto_wep.c stable/10/sys/sparc64/pci/fire.c stable/10/sys/x86/cpufreq/powernow.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/xscale/ixp425/avila_ata.c ============================================================================== --- stable/10/sys/arm/xscale/ixp425/avila_ata.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/arm/xscale/ixp425/avila_ata.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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); Modified: stable/10/sys/boot/i386/zfsboot/zfsboot.c ============================================================================== --- stable/10/sys/boot/i386/zfsboot/zfsboot.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/boot/i386/zfsboot/zfsboot.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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 */ Modified: stable/10/sys/cam/scsi/scsi_all.c ============================================================================== --- stable/10/sys/cam/scsi/scsi_all.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/cam/scsi/scsi_all.c Thu Sep 8 15:06:28 2016 (r305615) @@ -8442,7 +8442,7 @@ scsi_read_attribute(struct ccb_scsiio *c 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; Modified: stable/10/sys/dev/aic7xxx/aic7xxx_osm.c ============================================================================== --- stable/10/sys/dev/aic7xxx/aic7xxx_osm.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/aic7xxx/aic7xxx_osm.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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: stable/10/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c ============================================================================== --- stable/10/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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: stable/10/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- stable/10/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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: stable/10/sys/dev/bxe/bxe.c ============================================================================== --- stable/10/sys/dev/bxe/bxe.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/bxe/bxe.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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] = Modified: stable/10/sys/dev/etherswitch/ip17x/ip17x.c ============================================================================== --- stable/10/sys/dev/etherswitch/ip17x/ip17x.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/etherswitch/ip17x/ip17x.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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: stable/10/sys/dev/usb/controller/ehci_ixp4xx.c ============================================================================== --- stable/10/sys/dev/usb/controller/ehci_ixp4xx.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/dev/usb/controller/ehci_ixp4xx.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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); Modified: stable/10/sys/net80211/ieee80211_crypto_wep.c ============================================================================== --- stable/10/sys/net80211/ieee80211_crypto_wep.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/net80211/ieee80211_crypto_wep.c Thu Sep 8 15:06:28 2016 (r305615) @@ -419,7 +419,7 @@ wep_decrypt(struct ieee80211_key *key, s } 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; Modified: stable/10/sys/sparc64/pci/fire.c ============================================================================== --- stable/10/sys/sparc64/pci/fire.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/sparc64/pci/fire.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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"); Modified: stable/10/sys/x86/cpufreq/powernow.c ============================================================================== --- stable/10/sys/x86/cpufreq/powernow.c Thu Sep 8 15:05:25 2016 (r305614) +++ stable/10/sys/x86/cpufreq/powernow.c Thu Sep 8 15:06:28 2016 (r305615) @@ -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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609081506.u88F6SE7087152>