summaryrefslogtreecommitdiffstats
path: root/drivers/virtio
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-05-07 16:52:21 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-05-07 16:52:21 +0200
commitc1f4d88abda3c6894d4027f85f640641b0ad3597 (patch)
treecdb65bc0fca3d0b1420d28cba615013ecb27c9ea /drivers/virtio
parentPCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI (diff)
downloadlinux-c1f4d88abda3c6894d4027f85f640641b0ad3597.tar.xz
linux-c1f4d88abda3c6894d4027f85f640641b0ad3597.zip
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 <mst@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/virtio')
-rw-r--r--drivers/virtio/virtio_pci_common.c3
1 files changed, 0 insertions, 3 deletions
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)