svn commit: r305614 - in stable/11/sys: arm/xscale/ixp425 boot/i386/zfsboot cam/ata cam/scsi dev/aic7xxx dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5416 dev/bxe dev/etherswitch/ip17x dev/usb/controll...
Pedro F. Giffuni
pfg at FreeBSD.org
Thu Sep 8 15:05:28 UTC 2016
Author: pfg
Date: Thu Sep 8 15:05:25 2016
New Revision: 305614
URL: https://svnweb.freebsd.org/changeset/base/305614
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/11/sys/arm/xscale/ixp425/avila_ata.c
stable/11/sys/boot/i386/zfsboot/zfsboot.c
stable/11/sys/cam/ata/ata_all.c
stable/11/sys/cam/scsi/scsi_all.c
stable/11/sys/cam/scsi/scsi_da.c
stable/11/sys/dev/aic7xxx/aic7xxx_osm.c
stable/11/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
stable/11/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
stable/11/sys/dev/bxe/bxe.c
stable/11/sys/dev/etherswitch/ip17x/ip17x.c
stable/11/sys/dev/usb/controller/ehci_ixp4xx.c
stable/11/sys/net80211/ieee80211_crypto_wep.c
stable/11/sys/sparc64/pci/fire.c
stable/11/sys/x86/cpufreq/powernow.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/xscale/ixp425/avila_ata.c
==============================================================================
--- stable/11/sys/arm/xscale/ixp425/avila_ata.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/arm/xscale/ixp425/avila_ata.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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/11/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/11/sys/boot/i386/zfsboot/zfsboot.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/boot/i386/zfsboot/zfsboot.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -576,7 +576,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/11/sys/cam/ata/ata_all.c
==============================================================================
--- stable/11/sys/cam/ata/ata_all.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/cam/ata/ata_all.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -1075,7 +1075,7 @@ ata_zac_mgmt_in(struct ccb_ataio *ataio,
} else {
command_out = ATA_RECV_FPDMA_QUEUED;
sectors_out = ATA_RFPDMA_ZAC_MGMT_IN << 8;
- auxiliary = (zm_action & 0xf) | (zone_flags << 8),
+ auxiliary = (zm_action & 0xf) | (zone_flags << 8);
ata_flags = CAM_ATAIO_FPDMA;
/*
* For RECEIVE FPDMA QUEUED, the transfer length is
Modified: stable/11/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_all.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/cam/scsi/scsi_all.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -8691,7 +8691,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/11/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_da.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/cam/scsi/scsi_da.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -5718,7 +5718,7 @@ scsi_ata_zac_mgmt_out(struct ccb_scsiio
if (use_ncq == 0) {
command_out = ATA_ZAC_MANAGEMENT_OUT;
- features_out = (zm_action & 0xf) | (zone_flags << 8),
+ features_out = (zm_action & 0xf) | (zone_flags << 8);
ata_flags = AP_FLAG_BYT_BLOK_BLOCKS;
if (dxfer_len == 0) {
protocol = AP_PROTO_NON_DATA;
@@ -5833,8 +5833,8 @@ scsi_ata_zac_mgmt_in(struct ccb_scsiio *
if (use_ncq == 0) {
command_out = ATA_ZAC_MANAGEMENT_IN;
/* XXX KDM put a macro here */
- features_out = (zm_action & 0xf) | (zone_flags << 8),
- sectors_out = dxfer_len >> 9, /* XXX KDM macro*/
+ features_out = (zm_action & 0xf) | (zone_flags << 8);
+ sectors_out = dxfer_len >> 9; /* XXX KDM macro */
protocol = AP_PROTO_DMA;
ata_flags |= AP_FLAG_TLEN_SECT_CNT;
auxiliary = 0;
Modified: stable/11/sys/dev/aic7xxx/aic7xxx_osm.c
==============================================================================
--- stable/11/sys/dev/aic7xxx/aic7xxx_osm.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/aic7xxx/aic7xxx_osm.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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/11/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
==============================================================================
--- stable/11/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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/11/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- stable/11/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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/11/sys/dev/bxe/bxe.c
==============================================================================
--- stable/11/sys/dev/bxe/bxe.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/bxe/bxe.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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: stable/11/sys/dev/etherswitch/ip17x/ip17x.c
==============================================================================
--- stable/11/sys/dev/etherswitch/ip17x/ip17x.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/etherswitch/ip17x/ip17x.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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/11/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- stable/11/sys/dev/usb/controller/ehci_ixp4xx.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/dev/usb/controller/ehci_ixp4xx.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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);
Modified: stable/11/sys/net80211/ieee80211_crypto_wep.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_crypto_wep.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/net80211/ieee80211_crypto_wep.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -433,7 +433,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/11/sys/sparc64/pci/fire.c
==============================================================================
--- stable/11/sys/sparc64/pci/fire.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/sparc64/pci/fire.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -740,11 +740,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/11/sys/x86/cpufreq/powernow.c
==============================================================================
--- stable/11/sys/x86/cpufreq/powernow.c Thu Sep 8 14:50:23 2016 (r305613)
+++ stable/11/sys/x86/cpufreq/powernow.c Thu Sep 8 15:05:25 2016 (r305614)
@@ -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",
More information about the svn-src-all
mailing list