diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-24 07:54:15 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-24 08:15:09 +0200 |
| commit | 59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee (patch) | |
| tree | 37e2f1dba713b5d1b835d05b3acf8d560678abbe /drivers/virtio/virtio_pci_common.c | |
| parent | 8b8e658b16336f0f50aba733f51db636ef121f50 (diff) | |
| download | blackbird-op-linux-59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee.tar.gz blackbird-op-linux-59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee.zip | |
virtio-pci: alloc only resources actually used.
Move resource allocation from common code to legacy and modern code.
Only request resources actually used, i.e. bar0 in legacy mode and
the bar(s) specified by capabilities in modern mode.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/virtio/virtio_pci_common.c')
| -rw-r--r-- | drivers/virtio/virtio_pci_common.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index e894eb278d83..4fd036c3468f 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -509,10 +509,6 @@ static int virtio_pci_probe(struct pci_dev *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). */ @@ -542,8 +538,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); @@ -561,7 +555,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); } |
