Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / drivers / virtio / virtio_pci_common.c

diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index eba1b7ac729454d30b1d611cd01d45b5ba23407e..78f804af6c2020a9b927286e3496f6a2d8541953 100644 (file)
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -502,18 +502,11 @@ 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)
                goto err_enable_device;
 
-       rc = pci_request_regions(pci_dev, "virtio-pci");
-       if (rc)
-               goto err_request_regions;
-
        if (force_legacy) {
                rc = virtio_pci_legacy_probe(vp_dev);
                /* Also try modern mode if we can't map BAR0 (no IO space). */
@@ -543,8 +536,6 @@ err_register:
        else
             virtio_pci_modern_remove(vp_dev);
 err_probe:
-       pci_release_regions(pci_dev);
-err_request_regions:
        pci_disable_device(pci_dev);
 err_enable_device:
        kfree(vp_dev);
@@ -562,7 +553,6 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
        else
                virtio_pci_modern_remove(vp_dev);
 
-       pci_release_regions(pci_dev);
        pci_disable_device(pci_dev);
 }