Message ID | 20201209235347.16180-16-ajit.khaparde@broadcom.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Ajit Khaparde |
Headers | show |
Series | fixes and refactoring changes for bnxt | expand |
Context | Check | Description |
---|---|---|
ci/checkpatch | warning | coding style issues |
On Wed, Dec 9, 2020 at 6:59 PM Ajit Khaparde <ajitkhaparde@gmail.com> wrote: > > Indentation and coding style fixes. > > Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com> > --- > drivers/net/bnxt/bnxt.h | 4 ++-- > drivers/net/bnxt/bnxt_ethdev.c | 9 ++++----- > drivers/net/bnxt/bnxt_reps.c | 2 +- > drivers/net/bnxt/bnxt_ring.c | 3 +-- > 4 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h > index 2a318efaf..556e99203 100644 > --- a/drivers/net/bnxt/bnxt.h > +++ b/drivers/net/bnxt/bnxt.h > @@ -127,9 +127,9 @@ > */ > #ifdef RTE_EXEC_ENV_FREEBSD > /* In FreeBSD OS, nic_uio driver does not support interrupts */ > -#define BNXT_NUM_ASYNC_CPR(bp) 0 > +#define BNXT_NUM_ASYNC_CPR(bp) 0U > #else > -#define BNXT_NUM_ASYNC_CPR(bp) 1 > +#define BNXT_NUM_ASYNC_CPR(bp) 1U > #endif > > #define BNXT_MISC_VEC_ID RTE_INTR_VEC_ZERO_OFFSET > diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c > index 21d9e26ca..9d5c8aa0f 100644 > --- a/drivers/net/bnxt/bnxt_ethdev.c > +++ b/drivers/net/bnxt/bnxt_ethdev.c > @@ -1264,11 +1264,10 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) > return -EINVAL; > } > > - if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) { > + if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) > PMD_DRV_LOG(ERR, > - "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n", > - bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); > - } > + "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n", > + bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); > > do { > rc = bnxt_hwrm_if_change(bp, true); > @@ -1622,7 +1621,7 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete) > out: > /* Timed out or success */ > if (new.link_status != eth_dev->data->dev_link.link_status || > - new.link_speed != eth_dev->data->dev_link.link_speed) { > + new.link_speed != eth_dev->data->dev_link.link_speed) { > rte_eth_linkstatus_set(eth_dev, &new); > > rte_eth_dev_callback_process(eth_dev, > diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c > index 167c46ad4..12d677d32 100644 > --- a/drivers/net/bnxt/bnxt_reps.c > +++ b/drivers/net/bnxt/bnxt_reps.c > @@ -56,7 +56,7 @@ bnxt_vfr_recv(uint16_t port_id, uint16_t queue_id, struct rte_mbuf *mbuf) > > /* Put this mbuf on the RxQ of the Representor */ > prod_rx_buf = &rep_rxr->rx_buf_ring[rep_rxr->rx_prod & mask]; > - if (!*prod_rx_buf) { > + if (*prod_rx_buf == NULL) { > *prod_rx_buf = mbuf; > vfr_bp->rx_bytes[que] += mbuf->pkt_len; > vfr_bp->rx_pkts[que]++; > diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c > index 579c48d8c..f83bcaba2 100644 > --- a/drivers/net/bnxt/bnxt_ring.c > +++ b/drivers/net/bnxt/bnxt_ring.c > @@ -599,8 +599,7 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index) > > if (rxq->rx_started) { > if (bnxt_init_one_rx_ring(rxq)) { > - PMD_DRV_LOG(ERR, > - "bnxt_init_one_rx_ring failed!\n"); > + PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n"); > bnxt_rx_queue_release_op(rxq); > rc = -ENOMEM; > goto err_out; > -- > 2.21.1 (Apple Git-122.3) > Acked-by: Lance Richardson <lance.richardson@broadcom.com>
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 2a318efaf..556e99203 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -127,9 +127,9 @@ */ #ifdef RTE_EXEC_ENV_FREEBSD /* In FreeBSD OS, nic_uio driver does not support interrupts */ -#define BNXT_NUM_ASYNC_CPR(bp) 0 +#define BNXT_NUM_ASYNC_CPR(bp) 0U #else -#define BNXT_NUM_ASYNC_CPR(bp) 1 +#define BNXT_NUM_ASYNC_CPR(bp) 1U #endif #define BNXT_MISC_VEC_ID RTE_INTR_VEC_ZERO_OFFSET diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 21d9e26ca..9d5c8aa0f 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1264,11 +1264,10 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) return -EINVAL; } - if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) { + if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) PMD_DRV_LOG(ERR, - "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n", - bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); - } + "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n", + bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); do { rc = bnxt_hwrm_if_change(bp, true); @@ -1622,7 +1621,7 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete) out: /* Timed out or success */ if (new.link_status != eth_dev->data->dev_link.link_status || - new.link_speed != eth_dev->data->dev_link.link_speed) { + new.link_speed != eth_dev->data->dev_link.link_speed) { rte_eth_linkstatus_set(eth_dev, &new); rte_eth_dev_callback_process(eth_dev, diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c index 167c46ad4..12d677d32 100644 --- a/drivers/net/bnxt/bnxt_reps.c +++ b/drivers/net/bnxt/bnxt_reps.c @@ -56,7 +56,7 @@ bnxt_vfr_recv(uint16_t port_id, uint16_t queue_id, struct rte_mbuf *mbuf) /* Put this mbuf on the RxQ of the Representor */ prod_rx_buf = &rep_rxr->rx_buf_ring[rep_rxr->rx_prod & mask]; - if (!*prod_rx_buf) { + if (*prod_rx_buf == NULL) { *prod_rx_buf = mbuf; vfr_bp->rx_bytes[que] += mbuf->pkt_len; vfr_bp->rx_pkts[que]++; diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 579c48d8c..f83bcaba2 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -599,8 +599,7 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index) if (rxq->rx_started) { if (bnxt_init_one_rx_ring(rxq)) { - PMD_DRV_LOG(ERR, - "bnxt_init_one_rx_ring failed!\n"); + PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n"); bnxt_rx_queue_release_op(rxq); rc = -ENOMEM; goto err_out;
Indentation and coding style fixes. Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com> --- drivers/net/bnxt/bnxt.h | 4 ++-- drivers/net/bnxt/bnxt_ethdev.c | 9 ++++----- drivers/net/bnxt/bnxt_reps.c | 2 +- drivers/net/bnxt/bnxt_ring.c | 3 +-- 4 files changed, 8 insertions(+), 10 deletions(-)