vDPA/ifcvf: decouple vq irq requester from the adapter

commit 16dba33e7d7ac5a82e01fc6277eb0896efb62dfc upstream.

This commit decouples the vq irq requester from the adapter,
so that these functions can be invoked since probe.

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Cc: stable@vger.kernel.org
Message-Id: <20221125145724.1129962-7-lingshan.zhu@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 7db007ba0dcf5bd132ebbeb49e5bd495c92c240f..8573804e344088c4400dc5873af85e038776d634 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -155,10 +155,9 @@ static int ifcvf_alloc_vectors(struct ifcvf_adapter *adapter)
        return ret;
 }
 
-static int ifcvf_request_per_vq_irq(struct ifcvf_adapter *adapter)
+static int ifcvf_request_per_vq_irq(struct ifcvf_hw *vf)
 {
-       struct pci_dev *pdev = adapter->pdev;
-       struct ifcvf_hw *vf = &adapter->vf;
+       struct pci_dev *pdev = vf->pdev;
        int i, vector, ret, irq;
 
        vf->vqs_reused_irq = -EINVAL;
@@ -190,10 +189,9 @@ err:
        return -EFAULT;
 }
 
-static int ifcvf_request_vqs_reused_irq(struct ifcvf_adapter *adapter)
+static int ifcvf_request_vqs_reused_irq(struct ifcvf_hw *vf)
 {
-       struct pci_dev *pdev = adapter->pdev;
-       struct ifcvf_hw *vf = &adapter->vf;
+       struct pci_dev *pdev = vf->pdev;
        int i, vector, ret, irq;
 
        vector = 0;
@@ -266,15 +264,14 @@ err:
 
 }
 
-static int ifcvf_request_vq_irq(struct ifcvf_adapter *adapter)
+static int ifcvf_request_vq_irq(struct ifcvf_hw *vf)
 {
-       struct ifcvf_hw *vf = &adapter->vf;
        int ret;
 
        if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG)
-               ret = ifcvf_request_per_vq_irq(adapter);
+               ret = ifcvf_request_per_vq_irq(vf);
        else
-               ret = ifcvf_request_vqs_reused_irq(adapter);
+               ret = ifcvf_request_vqs_reused_irq(vf);
 
        return ret;
 }
@@ -341,7 +338,7 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter)
                return ret;
        }
 
-       ret = ifcvf_request_vq_irq(adapter);
+       ret = ifcvf_request_vq_irq(vf);
        if (ret)
                return ret;