From: Michael S. Tsirkin Date: Thu, 7 May 2015 14:52:21 +0000 (-0500) Subject: virtio_pci: drop pci_msi_off() call during probe X-Git-Tag: firefly_0821_release~176^2~1612^2~3^6~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1f4d88abda3c6894d4027f85f640641b0ad3597;p=firefly-linux-kernel-4.4.55.git virtio_pci: 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 Signed-off-by: Bjorn Helgaas --- diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index e894eb278d83..806bb2c2e382 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -501,9 +501,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, INIT_LIST_HEAD(&vp_dev->virtqueues); spin_lock_init(&vp_dev->lock); - /* Disable MSI/MSIX to bring device to a known good state. */ - pci_msi_off(pci_dev); - /* enable the device */ rc = pci_enable_device(pci_dev); if (rc)