[PATCH virtio v2 02/13] virtio_pci: simplify vp_request_msix_vectors() call a bit

[Jiri Pirko]

From: Jiri Pirko <j...@nvidia.com>

Pass desc arg as it is always to vp_request_msix_vectors(). There rely
on per_vq_vectors arg and null desc in case it is false.

Signed-off-by: Jiri Pirko <j...@nvidia.com>
---
 drivers/virtio/virtio_pci_common.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/virtio/virtio_pci_common.c 
b/drivers/virtio/virtio_pci_common.c
index 277591a6ab96..cda0d35dd9e1 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -125,6 +125,9 @@ static int vp_request_msix_vectors(struct virtio_device 
*vdev, int nvectors,
                                        GFP_KERNEL))
                        goto error;
 
+       if (!per_vq_vectors)
+               desc = NULL;
+
        if (desc) {
                flags |= PCI_IRQ_AFFINITY;
                desc->pre_vectors++; /* virtio config vector */
@@ -349,8 +352,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, 
unsigned int nvqs,
                nvectors = 2;
        }
 
-       err = vp_request_msix_vectors(vdev, nvectors, per_vq_vectors,
-                                     per_vq_vectors ? desc : NULL);
+       err = vp_request_msix_vectors(vdev, nvectors, per_vq_vectors, desc);
        if (err)
                goto error_find;
 
-- 
2.45.2