diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2014-02-18 05:08:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-18 15:33:30 -0500 |
commit | abbb6a373ad9bf3a169135cb09494af35f02dbd9 (patch) | |
tree | 509b1211a68d1c3496b6a454b06345dab39a8fde /drivers/net/ethernet/cisco | |
parent | bd66368940ae1c8c7491f55650b813c9d790f92c (diff) |
enic: Use pci_enable_msix_range() 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() and pci_enable_msix_range()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Sujith Sankar <ssujith@cisco.com>
Cc: Govindarajulu Varadarajan <govindarajulu90@gmail.com>
Cc: Neel Patel <neepatel@cisco.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Acked-by: Govindarajulu Varadarajan <govindarajulu90@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index b740bfce72ef..dcd58f23834a 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -1796,7 +1796,8 @@ static int enic_set_intr_mode(struct enic *enic) | |||
1796 | enic->cq_count >= n + m && | 1796 | enic->cq_count >= n + m && |
1797 | enic->intr_count >= n + m + 2) { | 1797 | enic->intr_count >= n + m + 2) { |
1798 | 1798 | ||
1799 | if (!pci_enable_msix(enic->pdev, enic->msix_entry, n + m + 2)) { | 1799 | if (pci_enable_msix_range(enic->pdev, enic->msix_entry, |
1800 | n + m + 2, n + m + 2) > 0) { | ||
1800 | 1801 | ||
1801 | enic->rq_count = n; | 1802 | enic->rq_count = n; |
1802 | enic->wq_count = m; | 1803 | enic->wq_count = m; |
@@ -1815,7 +1816,8 @@ static int enic_set_intr_mode(struct enic *enic) | |||
1815 | enic->wq_count >= m && | 1816 | enic->wq_count >= m && |
1816 | enic->cq_count >= 1 + m && | 1817 | enic->cq_count >= 1 + m && |
1817 | enic->intr_count >= 1 + m + 2) { | 1818 | enic->intr_count >= 1 + m + 2) { |
1818 | if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) { | 1819 | if (pci_enable_msix_range(enic->pdev, enic->msix_entry, |
1820 | 1 + m + 2, 1 + m + 2) > 0) { | ||
1819 | 1821 | ||
1820 | enic->rq_count = 1; | 1822 | enic->rq_count = 1; |
1821 | enic->wq_count = m; | 1823 | enic->wq_count = m; |