vDPA/ifcvf: introduce get_dev_type() which returns virtio dev id

This commit introduces a new function get_dev_type() which returns
the virtio device id of a device, to avoid duplicated code.

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210812032454.24486-2-lingshan.zhu@intel.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 351c6cf..52465b7 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -458,6 +458,26 @@ static const struct vdpa_config_ops ifc_vdpa_ops = {
        .get_vq_notification = ifcvf_get_vq_notification,
 };
 
+static u32 get_dev_type(struct pci_dev *pdev)
+{
+       u32 dev_type;
+
+       /* This drirver drives both modern virtio devices and transitional
+        * devices in modern mode.
+        * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM,
+        * so legacy devices and transitional devices in legacy
+        * mode will not work for vDPA, this driver will not
+        * drive devices with legacy interface.
+        */
+
+       if (pdev->device < 0x1040)
+               dev_type =  pdev->subsystem_device;
+       else
+               dev_type =  pdev->device - 0x1040;
+
+       return dev_type;
+}
+
 static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct device *dev = &pdev->dev;
@@ -502,19 +522,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        pci_set_drvdata(pdev, adapter);
 
        vf = &adapter->vf;
-
-       /* This drirver drives both modern virtio devices and transitional
-        * devices in modern mode.
-        * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM,
-        * so legacy devices and transitional devices in legacy
-        * mode will not work for vDPA, this driver will not
-        * drive devices with legacy interface.
-        */
-       if (pdev->device < 0x1040)
-               vf->dev_type =  pdev->subsystem_device;
-       else
-               vf->dev_type =  pdev->device - 0x1040;
-
+       vf->dev_type = get_dev_type(pdev);
        vf->base = pcim_iomap_table(pdev);
 
        adapter->pdev = pdev;