On Tue, 2014-02-18 at 11:07 +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> Cc: Michael Chan <mchan@xxxxxxxxxxxx>
> Cc: netdev@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx
> ---
> drivers/net/ethernet/broadcom/bnx2.c | 15 ++++-----------
> 1 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
> index cda25ac..ca6b362 100644
> --- a/drivers/net/ethernet/broadcom/bnx2.c
> +++ b/drivers/net/ethernet/broadcom/bnx2.c
> @@ -6206,7 +6206,7 @@ bnx2_free_irq(struct bnx2 *bp)
> static void
> bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
> {
> - int i, total_vecs, rc;
> + int i, total_vecs;
> struct msix_entry msix_ent[BNX2_MAX_MSIX_VEC];
> struct net_device *dev = bp->dev;
> const int len = sizeof(bp->irq_tbl[0].name);
> @@ -6229,16 +6229,9 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
> #ifdef BCM_CNIC
> total_vecs++;
> #endif
> - rc = -ENOSPC;
> - while (total_vecs >= BNX2_MIN_MSIX_VEC) {
> - rc = pci_enable_msix(bp->pdev, msix_ent, total_vecs);
> - if (rc <= 0)
> - break;
> - if (rc > 0)
> - total_vecs = rc;
> - }
> -
> - if (rc != 0)
> + total_vecs = pci_enable_msix_range(bp->pdev, msix_ent,
> + BNX2_MIN_MSIX_VEC, total_vecs);
> + if (total_vecs < 0)
> return;
This would be better without the assignment to total_vecs.
Ben.
> msix_vecs = total_vecs;
--
Ben Hutchings
I haven't lost my mind; it's backed up on tape somewhere.
Attachment:
signature.asc
Description: This is a digitally signed message part
