diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-03-30 16:04:25 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-03-30 16:04:25 +0000 |
| commit | aeb665b538d2cbcf71c2f865dfc57ec460b20c30 (patch) | |
| tree | 2893c750870823a694f7ce5be8cee4cb870c8a5a /sys/dev | |
| parent | 93e39e2325fcd42e8570a3f6e528fa920f84d1e1 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bnxt/bnxt_hwrm.c | 2 | ||||
| -rw-r--r-- | sys/dev/bnxt/bnxt_sysctl.c | 4 | ||||
| -rw-r--r-- | sys/dev/bxe/bxe.c | 2 | ||||
| -rw-r--r-- | sys/dev/etherswitch/mtkswitch/mtkswitch_mt7620.c | 2 | ||||
| -rw-r--r-- | sys/dev/hptnr/hptnr_os_bsd.c | 2 | ||||
| -rw-r--r-- | sys/dev/nvme/nvme_qpair.c | 2 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_hw_queues.c | 2 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_io.c | 2 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_mgmt.c | 2 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_node.c | 2 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/discovery/dm/dmdisc.c | 4 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/sallsdk/spc/sainit.c | 2 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c | 4 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/tisa/sassata/common/tdmisc.c | 2 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c | 4 | ||||
| -rw-r--r-- | sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c | 2 | ||||
| -rw-r--r-- | sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 4 | ||||
| -rw-r--r-- | sys/dev/qlxgbe/ql_hw.c | 4 | ||||
| -rw-r--r-- | sys/dev/smartpqi/smartpqi_queue.c | 10 | ||||
| -rw-r--r-- | sys/dev/smartpqi/smartpqi_request.c | 2 | ||||
| -rw-r--r-- | sys/dev/vnic/thunder_bgx.c | 2 |
21 files changed, 31 insertions, 31 deletions
diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 8023051be37f..daee41863835 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -861,7 +861,7 @@ bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt_softc *softc, struct hwrm_cfa_l2_set_rx_mask_input req = {0}; struct bnxt_vlan_tag *tag; uint32_t *tags; - uint32_t num_vlan_tags = 0;; + uint32_t num_vlan_tags = 0; uint32_t i; uint32_t mask = vnic->rx_mask; int rc; diff --git a/sys/dev/bnxt/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_sysctl.c index e566c54e5544..2622e164f7a5 100644 --- a/sys/dev/bnxt/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_sysctl.c @@ -1204,7 +1204,7 @@ bnxt_create_config_sysctls_pre(struct bnxt_softc *softc) struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(softc->dev); struct sysctl_oid_list *children; - children = SYSCTL_CHILDREN(device_get_sysctl_tree(softc->dev));; + children = SYSCTL_CHILDREN(device_get_sysctl_tree(softc->dev)); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "rss_key", CTLTYPE_STRING | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, softc, 0, @@ -1409,7 +1409,7 @@ bnxt_create_config_sysctls_post(struct bnxt_softc *softc) struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(softc->dev); struct sysctl_oid_list *children; - children = SYSCTL_CHILDREN(device_get_sysctl_tree(softc->dev));; + children = SYSCTL_CHILDREN(device_get_sysctl_tree(softc->dev)); SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "vlan_only", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, softc, 0, diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 377910611400..278f16be1116 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -15939,7 +15939,7 @@ static void bxe_force_link_reset(struct bxe_softc *sc) static int bxe_sysctl_pauseparam(SYSCTL_HANDLER_ARGS) { - struct bxe_softc *sc = (struct bxe_softc *)arg1;; + struct bxe_softc *sc = (struct bxe_softc *)arg1; uint32_t cfg_idx = bxe_get_link_cfg_idx(sc); int rc = 0; int error; diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch_mt7620.c b/sys/dev/etherswitch/mtkswitch/mtkswitch_mt7620.c index 8ad29107f7da..2917793246b7 100644 --- a/sys/dev/etherswitch/mtkswitch/mtkswitch_mt7620.c +++ b/sys/dev/etherswitch/mtkswitch/mtkswitch_mt7620.c @@ -140,7 +140,7 @@ mtkswitch_reg_read32_mt7621(struct mtkswitch_softc *sc, int reg) low = mtkswitch_phy_read_locked(sc, MTKSWITCH_GLOBAL_PHY, MTKSWITCH_REG_LO(reg)); hi = mtkswitch_phy_read_locked(sc, MTKSWITCH_GLOBAL_PHY, - MTKSWITCH_REG_HI(reg));; + MTKSWITCH_REG_HI(reg)); return (low | (hi << 16)); } diff --git a/sys/dev/hptnr/hptnr_os_bsd.c b/sys/dev/hptnr/hptnr_os_bsd.c index ea04c9d532b2..69bdf2193151 100644 --- a/sys/dev/hptnr/hptnr_os_bsd.c +++ b/sys/dev/hptnr/hptnr_os_bsd.c @@ -90,7 +90,7 @@ BUS_ADDRESS get_dmapool_phy_addr(void *osext, void * dmapool_virt_addr) HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) { - return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4);; + return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4); }/* PCI space access */ void *os_map_pci_bar( diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 4929340fdb60..38f6e6ef4ada 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -704,7 +704,7 @@ nvme_qpair_construct(struct nvme_qpair *qpair, cmdsz = roundup2(cmdsz, PAGE_SIZE); cplsz = qpair->num_entries * sizeof(struct nvme_completion); cplsz = roundup2(cplsz, PAGE_SIZE); - prpsz = sizeof(uint64_t) * NVME_MAX_PRP_LIST_ENTRIES;; + prpsz = sizeof(uint64_t) * NVME_MAX_PRP_LIST_ENTRIES; prpmemsz = qpair->num_trackers * prpsz; allocsz = cmdsz + cplsz + prpmemsz; diff --git a/sys/dev/ocs_fc/ocs_hw_queues.c b/sys/dev/ocs_fc/ocs_hw_queues.c index 3157fc7dfe22..1e0ab8866564 100644 --- a/sys/dev/ocs_fc/ocs_hw_queues.c +++ b/sys/dev/ocs_fc/ocs_hw_queues.c @@ -1625,7 +1625,7 @@ ocs_hw_qtop_parse(ocs_hw_t *hw, const char *qtop_string) /* Parse the tokens */ for (s = qtop_string; (tokarray.inuse_count < tokarray.alloc_count) && ((s = tokenize(s, &tokarray.tokens[tokarray.inuse_count]))) != NULL; ) { - tokarray.inuse_count++;; + tokarray.inuse_count++; } /* Allocate a queue topology structure */ diff --git a/sys/dev/ocs_fc/ocs_io.c b/sys/dev/ocs_fc/ocs_io.c index 2951500efc36..125aa87d22e6 100644 --- a/sys/dev/ocs_fc/ocs_io.c +++ b/sys/dev/ocs_fc/ocs_io.c @@ -110,7 +110,7 @@ ocs_io_pool_create(ocs_t *ocs, uint32_t num_io, uint32_t num_sgl) io_pool = ocs_malloc(ocs, sizeof(*io_pool), OCS_M_ZERO | OCS_M_NOWAIT); if (io_pool == NULL) { ocs_log_err(ocs, "allocate of IO pool failed\n"); - return NULL;; + return NULL; } io_pool->ocs = ocs; diff --git a/sys/dev/ocs_fc/ocs_mgmt.c b/sys/dev/ocs_fc/ocs_mgmt.c index cf2e9219aacc..3359814db847 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.c +++ b/sys/dev/ocs_fc/ocs_mgmt.c @@ -912,7 +912,7 @@ static int32_t ocs_mgmt_get_sfp(ocs_t *ocs, uint16_t page, void *buf, uint32_t buf_len) { int rc = 0; - ocs_mgmt_sfp_result_t *result = ocs_malloc(ocs, sizeof(ocs_mgmt_sfp_result_t), OCS_M_ZERO | OCS_M_NOWAIT);; + ocs_mgmt_sfp_result_t *result = ocs_malloc(ocs, sizeof(ocs_mgmt_sfp_result_t), OCS_M_ZERO | OCS_M_NOWAIT); ocs_sem_init(&(result->semaphore), 0, "get_sfp"); ocs_lock_init(ocs, &(result->cb_lock), "get_sfp"); diff --git a/sys/dev/ocs_fc/ocs_node.c b/sys/dev/ocs_fc/ocs_node.c index 4809b98957c3..75a0d430f4ca 100644 --- a/sys/dev/ocs_fc/ocs_node.c +++ b/sys/dev/ocs_fc/ocs_node.c @@ -205,7 +205,7 @@ ocs_node_find(ocs_sport_t *sport, uint32_t port_id) ocs_node_t * ocs_node_find_wwpn(ocs_sport_t *sport, uint64_t wwpn) { - ocs_node_t *node = NULL;; + ocs_node_t *node = NULL; ocs_assert(sport, NULL); diff --git a/sys/dev/pms/RefTisa/discovery/dm/dmdisc.c b/sys/dev/pms/RefTisa/discovery/dm/dmdisc.c index 9bee9722cc56..71ba479fcf2b 100644 --- a/sys/dev/pms/RefTisa/discovery/dm/dmdisc.c +++ b/sys/dev/pms/RefTisa/discovery/dm/dmdisc.c @@ -505,11 +505,11 @@ dmDownStreamDiscovering( } else { - DMLIST_DEQUEUE_FROM_HEAD(&ExpanderList, &(onePortContext->discovery.discoveringExpanderList));; + DMLIST_DEQUEUE_FROM_HEAD(&ExpanderList, &(onePortContext->discovery.discoveringExpanderList)); NextExpander = DMLIST_OBJECT_BASE(dmExpander_t, linkNode, ExpanderList); if ( NextExpander != agNULL) { - DMLIST_ENQUEUE_AT_HEAD(&(NextExpander->linkNode), &(onePortContext->discovery.discoveringExpanderList));; + DMLIST_ENQUEUE_AT_HEAD(&(NextExpander->linkNode), &(onePortContext->discovery.discoveringExpanderList)); DM_DBG3(("dmDownStreamDiscovering tdsaSASDownStreamDiscovering: dequeue head\n")); DM_DBG3(("dmDownStreamDiscovering: expander id %d\n", NextExpander->id)); } diff --git a/sys/dev/pms/RefTisa/sallsdk/spc/sainit.c b/sys/dev/pms/RefTisa/sallsdk/spc/sainit.c index 6e112adb95a7..94e2ef00a6b5 100644 --- a/sys/dev/pms/RefTisa/sallsdk/spc/sainit.c +++ b/sys/dev/pms/RefTisa/sallsdk/spc/sainit.c @@ -1765,7 +1765,7 @@ GLOBAL bit32 siConfiguration( for( i = 0; i < queueConfig->numInboundQueues; i ++ ) { mpiConfig->inboundQueues[i].numElements = (bit16)queueConfig->inboundQueues[i].elementCount; - mpiConfig->inboundQueues[i].elementSize = (bit16)queueConfig->inboundQueues[i].elementSize;; + mpiConfig->inboundQueues[i].elementSize = (bit16)queueConfig->inboundQueues[i].elementSize; mpiConfig->inboundQueues[i].priority = queueConfig->inboundQueues[i].priority; SA_DBG2(("siConfiguration: IBQ%d:elementCount=%d elementSize=%d priority=%d Total Size 0x%X\n", diff --git a/sys/dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c b/sys/dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c index 591db4c02602..8b61de4af01a 100644 --- a/sys/dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c +++ b/sys/dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c @@ -1757,7 +1757,7 @@ osGLOBAL void ossaHwCB( { TI_DBG1(("ossaHwCB: OSSA_HW_EVENT_PHY_STOP_STATUS, SUCCESS\n")); agContext = (agsaContext_t *)eventParm2; - onePortContext = (tdsaPortContext_t *)agContext->osData;; + onePortContext = (tdsaPortContext_t *)agContext->osData; if (onePortContext == agNULL) { TI_DBG1(("ossaHwCB: onePortContext is null, wrong!!!\n")); @@ -3716,7 +3716,7 @@ ossaIntCoalesceInitCB( tiIntCoalesceContext_t *tiIntCoalesceCxt; tdsaIntCoalesceContext_t *tdsaIntCoalCxt; tdsaIntCoalesceContext_t *tdsaIntCoalCxtHead - = (tdsaIntCoalesceContext_t *)tdsaAllShared->IntCoalesce;; + = (tdsaIntCoalesceContext_t *)tdsaAllShared->IntCoalesce; bit32 tiStatus; TI_DBG2(("ossaIntCoalesceInitCB: start\n")); diff --git a/sys/dev/pms/RefTisa/tisa/sassata/common/tdmisc.c b/sys/dev/pms/RefTisa/tisa/sassata/common/tdmisc.c index 302a1163758a..bb5c75f6ecd1 100644 --- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdmisc.c +++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdmisc.c @@ -1599,7 +1599,7 @@ tiCOMPassthroughCmndStart( break; case tiConfigureRteInfo: - SMPFn = SMP_CONFIGURE_ROUTING_INFORMATION;; + SMPFn = SMP_CONFIGURE_ROUTING_INFORMATION; if (tdPTCmndBody->protocol.SMP.IT == SMP_INITIATOR) { SMPFrameLen = sizeof(SmpReqConfigureRouteInformation_t); diff --git a/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c index 7be19115b6b2..62a70e5ecd49 100644 --- a/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c +++ b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c @@ -1790,9 +1790,9 @@ tdsaSASDownStreamDiscovering( } else { - TDLIST_DEQUEUE_FROM_HEAD(&ExpanderList, &(onePortContext->discovery.discoveringExpanderList));; + TDLIST_DEQUEUE_FROM_HEAD(&ExpanderList, &(onePortContext->discovery.discoveringExpanderList)); NextExpander = TDLIST_OBJECT_BASE(tdsaExpander_t, linkNode, ExpanderList); - TDLIST_ENQUEUE_AT_HEAD(&(NextExpander->linkNode), &(onePortContext->discovery.discoveringExpanderList));; + TDLIST_ENQUEUE_AT_HEAD(&(NextExpander->linkNode), &(onePortContext->discovery.discoveringExpanderList)); tdsaSingleThreadedLeave(tiRoot, TD_DISC_LOCK); TI_DBG3(("tdssSASDiscoveringExpander tdsaSASDownStreamDiscovering: dequeue head\n")); TI_DBG3(("tdsaSASDownStreamDiscovering: expander id %d\n", NextExpander->id)); diff --git a/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c index 2b0ae73ee24c..23a148c93326 100644 --- a/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c +++ b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.c @@ -19869,7 +19869,7 @@ bit32 satAddNComparebit32(bit8 *a, bit8 *b) } - return agFALSE;; + return agFALSE; } /*****************************************************************************/ diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c index ef7dc19c05ce..1144cc5c43b0 100644 --- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c +++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c @@ -3540,7 +3540,7 @@ static int agtiapi_PrepareSMPSGList( struct agtiapi_softc *pmcsc, ccb_t *pccb ) "not supported\n" ); ccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(ccb); - return tiReject;; + return tiReject; } if (ccbh->flags & CAM_SCATTER_VALID) @@ -3556,7 +3556,7 @@ static int agtiapi_PrepareSMPSGList( struct agtiapi_softc *pmcsc, ccb_t *pccb ) "not supported\n" ); ccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(ccb); - return tiReject;; + return tiReject; } if ( csmpio->smp_request_sglist_cnt != 0 ) { diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c index 7c8e7da82192..1f393c9afefc 100644 --- a/sys/dev/qlxgbe/ql_hw.c +++ b/sys/dev/qlxgbe/ql_hw.c @@ -4317,7 +4317,7 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) offset = hdrlen + 4; if (mp->m_len >= offset) { - th = (struct tcphdr *)(mp->m_data + hdrlen);; + th = (struct tcphdr *)(mp->m_data + hdrlen); } else { m_copydata(mp, hdrlen, 4, buf); th = (struct tcphdr *)buf; @@ -4341,7 +4341,7 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) offset = hdrlen + 4; if (mp->m_len >= offset) { - th = (struct tcphdr *)(mp->m_data + hdrlen);; + th = (struct tcphdr *)(mp->m_data + hdrlen); } else { m_copydata(mp, hdrlen, 4, buf); th = (struct tcphdr *)buf; diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c index bf7641e9ce97..59016e838b93 100644 --- a/sys/dev/smartpqi/smartpqi_queue.c +++ b/sys/dev/smartpqi/smartpqi_queue.c @@ -282,7 +282,7 @@ void pqisrc_print_adminq_config(pqisrc_softstate_t *softs) */ int pqisrc_create_admin_queue(pqisrc_softstate_t *softs) { - int ret = PQI_STATUS_SUCCESS;; + int ret = PQI_STATUS_SUCCESS; uint32_t admin_q_param = 0; DBG_FUNC("IN\n"); @@ -527,7 +527,7 @@ int pqisrc_destroy_admin_queue(pqisrc_softstate_t *softs) int pqisrc_change_op_ibq_queue_prop(pqisrc_softstate_t *softs, ib_queue_t *op_ib_q, uint32_t prop) { - int ret = PQI_STATUS_SUCCESS;; + int ret = PQI_STATUS_SUCCESS; gen_adm_req_iu_t admin_req; gen_adm_resp_iu_t admin_resp; @@ -552,7 +552,7 @@ int pqisrc_change_op_ibq_queue_prop(pqisrc_softstate_t *softs, int pqisrc_create_op_obq(pqisrc_softstate_t *softs, ob_queue_t *op_ob_q) { - int ret = PQI_STATUS_SUCCESS;; + int ret = PQI_STATUS_SUCCESS; gen_adm_req_iu_t admin_req; gen_adm_resp_iu_t admin_resp; @@ -596,7 +596,7 @@ int pqisrc_create_op_obq(pqisrc_softstate_t *softs, int pqisrc_create_op_ibq(pqisrc_softstate_t *softs, ib_queue_t *op_ib_q) { - int ret = PQI_STATUS_SUCCESS;; + int ret = PQI_STATUS_SUCCESS; gen_adm_req_iu_t admin_req; gen_adm_resp_iu_t admin_resp; @@ -656,7 +656,7 @@ int pqisrc_create_op_aio_ibq(pqisrc_softstate_t *softs, int pqisrc_create_op_raid_ibq(pqisrc_softstate_t *softs, ib_queue_t *op_raid_ib_q) { - int ret = PQI_STATUS_SUCCESS;; + int ret = PQI_STATUS_SUCCESS; DBG_FUNC("IN\n"); diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index 50b694fde410..0af5f4c3e55a 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -548,7 +548,7 @@ int pqisrc_send_scsi_cmd_raidbypass(pqisrc_softstate_t *softs, return PQI_STATUS_FAILURE; /* Check for write to non-RAID-0. */ if (is_write && device->raid_level != SA_RAID_0) - return PQI_STATUS_FAILURE;; + return PQI_STATUS_FAILURE; if(blk_cnt == 0) return PQI_STATUS_FAILURE; diff --git a/sys/dev/vnic/thunder_bgx.c b/sys/dev/vnic/thunder_bgx.c index 6d34b320ef51..b2479d2dcd42 100644 --- a/sys/dev/vnic/thunder_bgx.c +++ b/sys/dev/vnic/thunder_bgx.c @@ -1052,7 +1052,7 @@ bgx_init_hw(struct bgx *bgx) static void bgx_get_qlm_mode(struct bgx *bgx) { - device_t dev = bgx->dev;; + device_t dev = bgx->dev; int lmac_type; int train_en; |
