Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aef80cf authored by Sinan Kaya's avatar Sinan Kaya Committed by Alex Williamson
Browse files

vfio: platform: rename reset function 



Renaming the reset function to of_reset as it is only used
by the device tree based platforms.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Reviewed-by: default avatarBaptiste Reynal <b.reynal@virtualopensystems.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent d370c917

drivers/vfio/platform/vfio_platform_common.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, 
		if (!strcmp(iter->compat, compat) &&

		if (!strcmp(iter->compat, compat) &&

			try_module_get(iter->owner)) {

			try_module_get(iter->owner)) {

			*module = iter->owner;

			*module = iter->owner;

			reset_fn = iter->reset;

			reset_fn = iter->of_reset;

			break;

			break;

		}

		}

	}

	}
@@ -51,18 +51,18 @@ static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, 




static void vfio_platform_get_reset(struct vfio_platform_device *vdev)

static void vfio_platform_get_reset(struct vfio_platform_device *vdev)

{

{

	vdev->reset = vfio_platform_lookup_reset(vdev->compat,

	vdev->of_reset = vfio_platform_lookup_reset(vdev->compat,

						    &vdev->reset_module);

						    &vdev->reset_module);

	if (!vdev->reset) {

	if (!vdev->of_reset) {

		request_module("vfio-reset:%s", vdev->compat);

		request_module("vfio-reset:%s", vdev->compat);

		vdev->reset = vfio_platform_lookup_reset(vdev->compat,

		vdev->of_reset = vfio_platform_lookup_reset(vdev->compat,

							&vdev->reset_module);

							&vdev->reset_module);

	}

	}

}

}





static void vfio_platform_put_reset(struct vfio_platform_device *vdev)

static void vfio_platform_put_reset(struct vfio_platform_device *vdev)

{

{

	if (vdev->reset)

	if (vdev->of_reset)

		module_put(vdev->reset_module);

		module_put(vdev->reset_module);

}

}
@@ -141,9 +141,9 @@ static void vfio_platform_release(void *device_data) 
	mutex_lock(&driver_lock);

	mutex_lock(&driver_lock);





	if (!(--vdev->refcnt)) {

	if (!(--vdev->refcnt)) {

		if (vdev->reset) {

		if (vdev->of_reset) {

			dev_info(vdev->device, "reset\n");

			dev_info(vdev->device, "reset\n");

			vdev->reset(vdev);

			vdev->of_reset(vdev);

		} else {

		} else {

			dev_warn(vdev->device, "no reset function found!\n");

			dev_warn(vdev->device, "no reset function found!\n");

		}

		}
@@ -175,9 +175,9 @@ static int vfio_platform_open(void *device_data) 
		if (ret)

		if (ret)

			goto err_irq;

			goto err_irq;





		if (vdev->reset) {

		if (vdev->of_reset) {

			dev_info(vdev->device, "reset\n");

			dev_info(vdev->device, "reset\n");

			vdev->reset(vdev);

			vdev->of_reset(vdev);

		} else {

		} else {

			dev_warn(vdev->device, "no reset function found!\n");

			dev_warn(vdev->device, "no reset function found!\n");

		}

		}
@@ -213,7 +213,7 @@ static long vfio_platform_ioctl(void *device_data, 
		if (info.argsz < minsz)

		if (info.argsz < minsz)

			return -EINVAL;

			return -EINVAL;





		if (vdev->reset)

		if (vdev->of_reset)

			vdev->flags |= VFIO_DEVICE_FLAGS_RESET;

			vdev->flags |= VFIO_DEVICE_FLAGS_RESET;

		info.flags = vdev->flags;

		info.flags = vdev->flags;

		info.num_regions = vdev->num_regions;

		info.num_regions = vdev->num_regions;
@@ -312,8 +312,8 @@ static long vfio_platform_ioctl(void *device_data, 
		return ret;

		return ret;





	} else if (cmd == VFIO_DEVICE_RESET) {

	} else if (cmd == VFIO_DEVICE_RESET) {

		if (vdev->reset)

		if (vdev->of_reset)

			return vdev->reset(vdev);

			return vdev->of_reset(vdev);

		else

		else

			return -EINVAL;

			return -EINVAL;

	}

	}
@@ -611,7 +611,7 @@ void vfio_platform_unregister_reset(const char *compat, 




	mutex_lock(&driver_lock);

	mutex_lock(&driver_lock);

	list_for_each_entry_safe(iter, temp, &reset_list, link) {

	list_for_each_entry_safe(iter, temp, &reset_list, link) {

		if (!strcmp(iter->compat, compat) && (iter->reset == fn)) {

		if (!strcmp(iter->compat, compat) && (iter->of_reset == fn)) {

			list_del(&iter->link);

			list_del(&iter->link);

			break;

			break;

		}

		}

drivers/vfio/platform/vfio_platform_private.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ struct vfio_platform_device { 
	struct resource*

	struct resource*

		(*get_resource)(struct vfio_platform_device *vdev, int i);

		(*get_resource)(struct vfio_platform_device *vdev, int i);

	int	(*get_irq)(struct vfio_platform_device *vdev, int i);

	int	(*get_irq)(struct vfio_platform_device *vdev, int i);

	int	(*reset)(struct vfio_platform_device *vdev);

	int	(*of_reset)(struct vfio_platform_device *vdev);

};

};





typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev);

typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev);
@@ -80,7 +80,7 @@ struct vfio_platform_reset_node { 
	struct list_head link;

	struct list_head link;

	char *compat;

	char *compat;

	struct module *owner;

	struct module *owner;

	vfio_platform_reset_fn_t reset;

	vfio_platform_reset_fn_t of_reset;

};

};





extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,

extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,
@@ -103,7 +103,7 @@ extern void vfio_platform_unregister_reset(const char *compat, 
static struct vfio_platform_reset_node __reset ## _node = {	\

static struct vfio_platform_reset_node __reset ## _node = {	\

	.owner = THIS_MODULE,					\

	.owner = THIS_MODULE,					\

	.compat = __compat,					\

	.compat = __compat,					\

	.reset = __reset,					\

	.of_reset = __reset,					\

};								\

};								\

__vfio_platform_register_reset(&__reset ## _node)

__vfio_platform_register_reset(&__reset ## _node)