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

Commit a2b8419a authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: remove unused parameter for hypervisor's host_exit call 



The parameter 'void *gvt' is not used and required for hypervisor's
exit call. Even for non-merged Xen hypervisor support. So just remove it.

Reviewed-by: default avatarYuan, Hang <hang.yuan@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 2313b189

drivers/gpu/drm/i915/gvt/gvt.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void intel_gvt_clean_device(struct drm_i915_private *dev_priv) 
		return;



	intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);

	intel_gvt_hypervisor_host_exit(&dev_priv->drm.pdev->dev, gvt);

	intel_gvt_hypervisor_host_exit(&dev_priv->drm.pdev->dev);

	intel_gvt_cleanup_vgpu_type_groups(gvt);

	intel_gvt_clean_vgpu_types(gvt);

drivers/gpu/drm/i915/gvt/hypercall.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
 */

struct intel_gvt_mpt {

	int (*host_init)(struct device *dev, void *gvt, const void *ops);

	void (*host_exit)(struct device *dev, void *gvt);

	void (*host_exit)(struct device *dev);

	int (*attach_vgpu)(void *vgpu, unsigned long *handle);

	void (*detach_vgpu)(unsigned long handle);

	int (*inject_msi)(unsigned long handle, u32 addr, u16 data);

drivers/gpu/drm/i915/gvt/kvmgt.c

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ static int kvmgt_host_init(struct device *dev, void *gvt, const void *ops) 
	return mdev_register_device(dev, &intel_vgpu_ops);

}



static void kvmgt_host_exit(struct device *dev, void *gvt)

static void kvmgt_host_exit(struct device *dev)

{

	mdev_unregister_device(dev);

}

drivers/gpu/drm/i915/gvt/mpt.h

+2 −3
Original line number Diff line number Diff line
@@ -61,14 +61,13 @@ static inline int intel_gvt_hypervisor_host_init(struct device *dev, 
/**

 * intel_gvt_hypervisor_host_exit - exit GVT-g host side

 */

static inline void intel_gvt_hypervisor_host_exit(struct device *dev,

			void *gvt)

static inline void intel_gvt_hypervisor_host_exit(struct device *dev)

{

	/* optional to provide */

	if (!intel_gvt_host.mpt->host_exit)

		return;



	intel_gvt_host.mpt->host_exit(dev, gvt);

	intel_gvt_host.mpt->host_exit(dev);

}



/**