Commit 572864d4 authored by Jiri Pirko's avatar Jiri Pirko Committed by Michael S. Tsirkin
Browse files

virtio_pci: simplify vp_request_msix_vectors() call a bit 



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: default avatarJiri Pirko <jiri@nvidia.com>
Message-Id: <20240716113552.80599-3-jiri@resnulli.us>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent de128f3f

drivers/virtio/virtio_pci_common.c

+4 −2
Original line number Diff line number Diff line
@@ -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;