> -----Original Message----- > From: Alexander Gordeev [mailto:agordeev@xxxxxxxxxx] > Sent: Friday, April 25, 2014 1:36 PM > To: linux-kernel > Cc: Alexander Gordeev; Shahed Shaikh; Dept-HSG Linux NIC Dev; netdev; > linux-pci > Subject: [PATCH net-next 2/2] qlcnic: Use pci_enable_msix_exact() instead > of pci_enable_msix() > > 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() or > pci_enable_msi_exact() and pci_enable_msix_range() or > pci_enable_msix_exact() interfaces. > > Cc: Shahed Shaikh <shahed.shaikh@xxxxxxxxxx> > Cc: Dept-HSGLinuxNICDev@xxxxxxxxxx > Cc: netdev@xxxxxxxxxxxxxxx > Cc: linux-pci@xxxxxxxxxxxxxxx > > Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx> > --- > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > index dbf7539..26f022b 100644 > --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > @@ -690,8 +690,8 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter > *adapter) > adapter->msix_entries[vector].entry = vector; > > restore: > - err = pci_enable_msix(pdev, adapter->msix_entries, num_msix); > - if (err > 0) { > + err = pci_enable_msix_exact(pdev, adapter->msix_entries, > num_msix); > + if (err == -ENOSPC) { > if (!adapter->drv_tss_rings && !adapter->drv_rss_rings) > return -ENOSPC; I think, it would be good if we return "err" instead of "-ENOSPC" . if (!adapter->drv_tss_rings && !adapter->drv_rss_rings) - return -ENOSPC; + return err; Thanks, Shahed
<<attachment: winmail.dat>>
