Commit 44566412 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zhi Wang
Browse files

drm/i915/gvt: streamline intel_vgpu_create 



Initialize variables at declaration time, avoid pointless gotos and
cater for the fact that intel_gvt_create_vgpu can't return NULL.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220411141403.86980-26-hch@lst.de


Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarZhi Wang <zhi.a.wang@intel.com>
parent 37e4bdbd

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

+9 −19
Original line number Diff line number Diff line
@@ -720,26 +720,19 @@ int intel_gvt_set_edid(struct intel_vgpu *vgpu, int port_num) 


static int intel_vgpu_create(struct mdev_device *mdev)

{

	struct intel_vgpu *vgpu = NULL;

	struct device *pdev = mdev_parent_dev(mdev);

	struct intel_gvt *gvt = kdev_to_i915(pdev)->gvt;

	struct intel_vgpu_type *type;

	struct device *pdev;

	struct intel_gvt *gvt;

	int ret;



	pdev = mdev_parent_dev(mdev);

	gvt = kdev_to_i915(pdev)->gvt;

	struct intel_vgpu *vgpu;



	type = &gvt->types[mdev_get_type_group_id(mdev)];

	if (!type) {

		ret = -EINVAL;

		goto out;

	}

	if (!type)

		return -EINVAL;



	vgpu = intel_gvt_create_vgpu(gvt, type);

	if (IS_ERR_OR_NULL(vgpu)) {

		ret = vgpu == NULL ? -EFAULT : PTR_ERR(vgpu);

		gvt_err("failed to create intel vgpu: %d\n", ret);

		goto out;

	if (IS_ERR(vgpu)) {

		gvt_err("failed to create intel vgpu: %ld\n", PTR_ERR(vgpu));

		return PTR_ERR(vgpu);

	}



	INIT_WORK(&vgpu->release_work, intel_vgpu_release_work);
@@ -749,10 +742,7 @@ static int intel_vgpu_create(struct mdev_device *mdev) 


	gvt_dbg_core("intel_vgpu_create succeeded for mdev: %s\n",

		     dev_name(mdev_dev(mdev)));

	ret = 0;



out:

	return ret;

	return 0;

}



static int intel_vgpu_remove(struct mdev_device *mdev)