* [PATCH] net: ethernet: broadcom: bnxt: remove dead code
@ 2017-05-15 22:28 Gustavo A. R. Silva
2017-05-16 0:34 ` Michael Chan
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2017-05-15 22:28 UTC (permalink / raw)
To: Michael Chan; +Cc: netdev, linux-kernel, 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 <garsilva@embeddedor.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 1f1e54b..018674b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -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++;
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: broadcom: bnxt: remove dead code
2017-05-15 22:28 [PATCH] net: ethernet: broadcom: bnxt: remove dead code Gustavo A. R. Silva
@ 2017-05-16 0:34 ` Michael Chan
2017-05-16 16:18 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Michael Chan @ 2017-05-16 0:34 UTC (permalink / raw)
To: Gustavo A. R. Silva; +Cc: Netdev, open list
On Mon, May 15, 2017 at 3:28 PM, Gustavo A. R. Silva
<garsilva@embeddedor.com> wrote:
> 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 <garsilva@embeddedor.com>
> ---
> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 1f1e54b..018674b 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -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.
>
> - 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: broadcom: bnxt: remove dead code
2017-05-16 0:34 ` Michael Chan
@ 2017-05-16 16:18 ` Gustavo A. R. Silva
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2017-05-16 16:18 UTC (permalink / raw)
To: Michael Chan; +Cc: Netdev, open list
Hi Michael,
Quoting Michael Chan <michael.chan@broadcom.com>:
> On Mon, May 15, 2017 at 3:28 PM, Gustavo A. R. Silva
> <garsilva@embeddedor.com> wrote:
>> 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 <garsilva@embeddedor.com>
>> ---
>> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
>> b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
>> index 1f1e54b..018674b 100644
>> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
>> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
>> @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-16 16:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-15 22:28 [PATCH] net: ethernet: broadcom: bnxt: remove dead code Gustavo A. R. Silva
2017-05-16 0:34 ` Michael Chan
2017-05-16 16:18 ` Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).