Skip to content

Commit 2727c88

Browse files
Michael Chandavem330
authored andcommitted
bnxt_en: Simplify ring alloc/free error messages.
Replace switch statements printing different messages for every ring type with a common message. Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ca2c39e commit 2727c88

File tree

1 file changed

+6
-37
lines changed
  • drivers/net/ethernet/broadcom/bnxt

1 file changed

+6
-37
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4336,26 +4336,9 @@ static int hwrm_ring_alloc_send_msg(struct bnxt *bp,
43364336
mutex_unlock(&bp->hwrm_cmd_lock);
43374337

43384338
if (rc || err) {
4339-
switch (ring_type) {
4340-
case RING_FREE_REQ_RING_TYPE_L2_CMPL:
4341-
netdev_err(bp->dev, "hwrm_ring_alloc cp failed. rc:%x err:%x\n",
4342-
rc, err);
4343-
return -1;
4344-
4345-
case RING_FREE_REQ_RING_TYPE_RX:
4346-
netdev_err(bp->dev, "hwrm_ring_alloc rx failed. rc:%x err:%x\n",
4347-
rc, err);
4348-
return -1;
4349-
4350-
case RING_FREE_REQ_RING_TYPE_TX:
4351-
netdev_err(bp->dev, "hwrm_ring_alloc tx failed. rc:%x err:%x\n",
4352-
rc, err);
4353-
return -1;
4354-
4355-
default:
4356-
netdev_err(bp->dev, "Invalid ring\n");
4357-
return -1;
4358-
}
4339+
netdev_err(bp->dev, "hwrm_ring_alloc type %d failed. rc:%x err:%x\n",
4340+
ring_type, rc, err);
4341+
return -EIO;
43594342
}
43604343
ring->fw_ring_id = ring_id;
43614344
return rc;
@@ -4479,23 +4462,9 @@ static int hwrm_ring_free_send_msg(struct bnxt *bp,
44794462
mutex_unlock(&bp->hwrm_cmd_lock);
44804463

44814464
if (rc || error_code) {
4482-
switch (ring_type) {
4483-
case RING_FREE_REQ_RING_TYPE_L2_CMPL:
4484-
netdev_err(bp->dev, "hwrm_ring_free cp failed. rc:%d\n",
4485-
rc);
4486-
return rc;
4487-
case RING_FREE_REQ_RING_TYPE_RX:
4488-
netdev_err(bp->dev, "hwrm_ring_free rx failed. rc:%d\n",
4489-
rc);
4490-
return rc;
4491-
case RING_FREE_REQ_RING_TYPE_TX:
4492-
netdev_err(bp->dev, "hwrm_ring_free tx failed. rc:%d\n",
4493-
rc);
4494-
return rc;
4495-
default:
4496-
netdev_err(bp->dev, "Invalid ring\n");
4497-
return -1;
4498-
}
4465+
netdev_err(bp->dev, "hwrm_ring_free type %d failed. rc:%x err:%x\n",
4466+
ring_type, rc, error_code);
4467+
return -EIO;
44994468
}
45004469
return 0;
45014470
}

0 commit comments

Comments
 (0)