From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 7 May 2015 14:52:22 +0000 (-0500)
Subject: ntb: Drop pci_msi_off() call during probe
X-Git-Tag: firefly_0821_release~176^2~1612^2~3^6~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c9bb608e8ac6fef829a629aa46a5238fad272a4;p=firefly-linux-kernel-4.4.55.git

ntb: Drop pci_msi_off() call during probe

The PCI core now disables MSI and MSI-X for all devices during enumeration
regardless of CONFIG_PCI_MSI.  Remove device-specific code to disable
MSI/MSI-X.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index cd29b1038c5e..8225cbcd6eb8 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev)
 	struct pci_dev *pdev = ndev->pdev;
 	int rc;
 
-	pci_msi_off(pdev);
-
 	/* Verify intx is enabled */
 	pci_intx(pdev, 1);