Commit abbb6a37 authored Feb 18, 2014 by Alexander Gordeev Committed by David S. Miller Feb 18, 2014

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>

parent bd663689

drivers/net/ethernet/cisco/enic/enic_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1796,7 +1796,8 @@ static int enic_set_intr_mode(struct enic *enic)
		enic->cq_count >= n + m &&
		enic->intr_count >= n + m + 2) {

		if (!pci_enable_msix(enic->pdev, enic->msix_entry, n + m + 2)) {
		if (pci_enable_msix_range(enic->pdev, enic->msix_entry,
		n + m + 2, n + m + 2) > 0) {

		enic->rq_count = n;
		enic->wq_count = m;
		@@ -1815,7 +1816,8 @@ static int enic_set_intr_mode(struct enic *enic)
		enic->wq_count >= m &&
		enic->cq_count >= 1 + m &&
		enic->intr_count >= 1 + m + 2) {
		if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) {
		if (pci_enable_msix_range(enic->pdev, enic->msix_entry,
		1 + m + 2, 1 + m + 2) > 0) {

		enic->rq_count = 1;
		enic->wq_count = m;