[Qemu-devel] [PATCH v14 03/22] vfio: Rearrange functions to get vfio_group from dev

[Kirti Wankhede]

This patch rearranges functions to get vfio_group from device

Signed-off-by: Kirti Wankhede <kwankh...@nvidia.com>
Signed-off-by: Neo Jia <c...@nvidia.com>
Reviewed-by: Jike Song <jike.s...@intel.com>

Change-Id: I1f93262bdbab75094bc24b087b29da35ba70c4c6
---
 drivers/vfio/vfio.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index d1d70e0b011b..23bc86c1d05d 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -480,6 +480,21 @@ static struct vfio_group *vfio_group_get_from_minor(int 
minor)
        return group;
 }
 
+static struct vfio_group *vfio_group_get_from_dev(struct device *dev)
+{
+       struct iommu_group *iommu_group;
+       struct vfio_group *group;
+
+       iommu_group = iommu_group_get(dev);
+       if (!iommu_group)
+               return NULL;
+
+       group = vfio_group_get_from_iommu(iommu_group);
+       iommu_group_put(iommu_group);
+
+       return group;
+}
+
 /**
  * Device objects - create, release, get, put, search
  */
@@ -811,16 +826,10 @@ EXPORT_SYMBOL_GPL(vfio_add_group_dev);
  */
 struct vfio_device *vfio_device_get_from_dev(struct device *dev)
 {
-       struct iommu_group *iommu_group;
        struct vfio_group *group;
        struct vfio_device *device;
 
-       iommu_group = iommu_group_get(dev);
-       if (!iommu_group)
-               return NULL;
-
-       group = vfio_group_get_from_iommu(iommu_group);
-       iommu_group_put(iommu_group);
+       group = vfio_group_get_from_dev(dev);
        if (!group)
                return NULL;
 
-- 
2.7.0