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.

Detected with devel/coccinelle following a hint from DragonFlyBSD.

MFC after:	1 month
This commit is contained in:
Pedro F. Giffuni 2016-08-09 19:42:20 +00:00
parent f0be707d74
commit a061aa46fe
8 changed files with 21 additions and 21 deletions

View File

@ -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);

View File

@ -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 */

View File

@ -1075,7 +1075,7 @@ ata_zac_mgmt_in(struct ccb_ataio *ataio, uint32_t retries,
} 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

View File

@ -8691,7 +8691,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;

View File

@ -5718,7 +5718,7 @@ scsi_ata_zac_mgmt_out(struct ccb_scsiio *csio, uint32_t retries,
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 *csio, uint32_t retries,
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;

View File

@ -433,7 +433,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;

View File

@ -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");

View File

@ -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",