Skip to contentSkip to conversation

net: ethernet: broadcom: bnxt: remove dead code

PATCH In review Gustavo A. R. Silva 2 participants 3 messages May 15, 2017 – May 16, 2017

Subsystems (3)
Networking Network drivers Broadcom bnxt_en 50 gigabit Ethernet driver
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 net: ethernet: broadcom: bnxt: remove dead code

Local variable _sh_ is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 1350916

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -6
index 1f1e54b..018674b 100644
@@ -7380,12 +7380,10 @@ static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx,
 static int bnxt_set_dflt_rings(struct bnxt *bp)
 {
 	int dflt_rings, max_rx_rings, max_tx_rings, rc;
-	bool sh = true;
 
-	if (sh)
-		bp->flags |= BNXT_FLAG_SHARED_RINGS;
+	bp->flags |= BNXT_FLAG_SHARED_RINGS;
 	dflt_rings = netif_get_num_default_rss_queues();
-	rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh);
+	rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, true);
 	if (rc)
 		return rc;
 	bp->rx_nr_rings = min_t(int, dflt_rings, max_rx_rings);

@@ -7396,8 +7394,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp)
 		netdev_warn(bp->dev, "Unable to reserve tx rings\n");
 
 	bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
-	bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) :
-			       bp->tx_nr_rings + bp->rx_nr_rings;
+	bp->cp_nr_rings = max_t(int, bp->tx_nr_rings, bp->rx_nr_rings);
 	bp->num_stat_ctxs = bp->cp_nr_rings;
 	if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {
 		bp->rx_nr_rings++;
Signature · 1 line
2.5.0
maintainer
#1 lore raw
Quoted 14 lines · Gustavo A. R. Silva

Local variable _sh_ is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 1350916

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -0
index 1f1e54b..018674b 100644

drivers/net/ethernet/broadcom/bnxt/bnxt.c static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx, · line 7383

Quoted 4 lines
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -1
@@ -7380,12 +7380,10 @@ static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx,
 static int bnxt_set_dflt_rings(struct bnxt *bp)
 {
        int dflt_rings, max_rx_rings, max_tx_rings, rc;
-       bool sh = true;

The point of this logic is that we can easily change the default to shared rings or separate rings. I think what I'll do is change it so that the parameter sh is passed in and let the caller decide. Thanks for pointing this out.

Quoted 23 lines
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -6
-       if (sh)
-               bp->flags |= BNXT_FLAG_SHARED_RINGS;
+       bp->flags |= BNXT_FLAG_SHARED_RINGS;
        dflt_rings = netif_get_num_default_rss_queues();
-       rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh);
+       rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, true);
        if (rc)
                return rc;
        bp->rx_nr_rings = min_t(int, dflt_rings, max_rx_rings);

@@ -7396,8 +7394,7 @@ static int bnxt_set_dflt_rings(struct bnxt *bp)
                netdev_warn(bp->dev, "Unable to reserve tx rings\n");
 
        bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
-       bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) :
-                              bp->tx_nr_rings + bp->rx_nr_rings;
+       bp->cp_nr_rings = max_t(int, bp->tx_nr_rings, bp->rx_nr_rings);
        bp->num_stat_ctxs = bp->cp_nr_rings;
        if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {
                bp->rx_nr_rings++;
--

2.5.0

author
#2 lore raw

Hi Michael,

Quoting Michael Chan <[email protected]>:

Quoted 11 lines
Quoted 9 lines · Gustavo A. R. Silva

Local variable _sh_ is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 1350916

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
Quoted 16 lines

drivers/net/ethernet/broadcom/bnxt/bnxt.c static int bnxt_get_dflt_rings(struct bnxt · line 7384

Quoted 10 lines
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -1
index 1f1e54b..018674b 100644
@@ -7380,12 +7380,10 @@ static int bnxt_get_dflt_rings(struct bnxt  
 *bp, int *max_rx, int *max_tx,
 static int bnxt_set_dflt_rings(struct bnxt *bp)
 {
        int dflt_rings, max_rx_rings, max_tx_rings, rc;
-       bool sh = true;

The point of this logic is that we can easily change the default to shared rings or separate rings. I think what I'll do is change it so that the parameter sh is passed in and let the caller decide. Thanks for pointing this out.

Sure thing, glad to help.
--
Gustavo A. R. Silva