summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2016-07-19 16:01:42 +0300
committerAlex Williamson <alex.williamson@redhat.com>2016-07-19 19:26:38 +0300
commitf084aa749537b818d5b234448e960a59836b39e3 (patch)
treeb87deab279c8fe6b491dfbfc8e3de10212c65ef9 /drivers/vfio
parent7aef80cf3187b76373359ed539e382eb34ebfb5d (diff)
downloadlinux-f084aa749537b818d5b234448e960a59836b39e3.tar.xz
vfio: platform: move reset call to a common function
The reset call sequence seems to replicate itself multiple times across the file. Grouping them together for maintenance reasons. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Reviewed-by: Eric Auger <eric.auger@linaro.org> Reviewed-by: Baptiste Reynal <b.reynal@virtualopensystems.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/platform/vfio_platform_common.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index 170479399cde..de419df768e1 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -134,6 +134,17 @@ static void vfio_platform_regions_cleanup(struct vfio_platform_device *vdev)
kfree(vdev->regions);
}
+static int vfio_platform_call_reset(struct vfio_platform_device *vdev)
+{
+ if (vdev->of_reset) {
+ dev_info(vdev->device, "reset\n");
+ return vdev->of_reset(vdev);
+ }
+
+ dev_warn(vdev->device, "no reset function found!\n");
+ return -EINVAL;
+}
+
static void vfio_platform_release(void *device_data)
{
struct vfio_platform_device *vdev = device_data;
@@ -141,12 +152,7 @@ static void vfio_platform_release(void *device_data)
mutex_lock(&driver_lock);
if (!(--vdev->refcnt)) {
- if (vdev->of_reset) {
- dev_info(vdev->device, "reset\n");
- vdev->of_reset(vdev);
- } else {
- dev_warn(vdev->device, "no reset function found!\n");
- }
+ vfio_platform_call_reset(vdev);
vfio_platform_regions_cleanup(vdev);
vfio_platform_irq_cleanup(vdev);
}
@@ -175,12 +181,7 @@ static int vfio_platform_open(void *device_data)
if (ret)
goto err_irq;
- if (vdev->of_reset) {
- dev_info(vdev->device, "reset\n");
- vdev->of_reset(vdev);
- } else {
- dev_warn(vdev->device, "no reset function found!\n");
- }
+ vfio_platform_call_reset(vdev);
}
vdev->refcnt++;
@@ -312,10 +313,7 @@ static long vfio_platform_ioctl(void *device_data,
return ret;
} else if (cmd == VFIO_DEVICE_RESET) {
- if (vdev->of_reset)
- return vdev->of_reset(vdev);
- else
- return -EINVAL;
+ return vfio_platform_call_reset(vdev);
}
return -ENOTTY;