drm/i915/gvt: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Because there is no need to check these functions, a number of local
functions can be made to return void to simplify things as nothing can
fail.

Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gvt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/gvt/debugfs.c b/drivers/gpu/drm/i915/gvt/debugfs.c
index 2fb7b73b260dab2f51587b6b52b222ec456ef0d8..285f6011a537eebdcf0b9870fce1c034e04f4f1c 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/debugfs.c
+++ b/drivers/gpu/drm/i915/gvt/debugfs.c
@@ -189,36 +189,19 @@ DEFINE_SIMPLE_ATTRIBUTE(vgpu_scan_nonprivbb_fops,
 /**
  * intel_gvt_debugfs_add_vgpu - register debugfs entries for a vGPU
  * @vgpu: a vGPU
- *
- * Returns:
- * Zero on success, negative error code if failed.
  */
-int intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu)
+void intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu)
 {
-       struct dentry *ent;
        char name[16] = "";
 
        snprintf(name, 16, "vgpu%d", vgpu->id);
        vgpu->debugfs = debugfs_create_dir(name, vgpu->gvt->debugfs_root);
-       if (!vgpu->debugfs)
-               return -ENOMEM;
-
-       ent = debugfs_create_bool("active", 0444, vgpu->debugfs,
-                                 &vgpu->active);
-       if (!ent)
-               return -ENOMEM;
-
-       ent = debugfs_create_file("mmio_diff", 0444, vgpu->debugfs,
-                                 vgpu, &vgpu_mmio_diff_fops);
-       if (!ent)
-               return -ENOMEM;
 
-       ent = debugfs_create_file("scan_nonprivbb", 0644, vgpu->debugfs,
-                                vgpu, &vgpu_scan_nonprivbb_fops);
-       if (!ent)
-               return -ENOMEM;
-
-       return 0;
+       debugfs_create_bool("active", 0444, vgpu->debugfs, &vgpu->active);
+       debugfs_create_file("mmio_diff", 0444, vgpu->debugfs, vgpu,
+                           &vgpu_mmio_diff_fops);
+       debugfs_create_file("scan_nonprivbb", 0644, vgpu->debugfs, vgpu,
+                           &vgpu_scan_nonprivbb_fops);
 }
 
 /**
@@ -234,27 +217,15 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu)
 /**
  * intel_gvt_debugfs_init - register gvt debugfs root entry
  * @gvt: GVT device
- *
- * Returns:
- * zero on success, negative if failed.
  */
-int intel_gvt_debugfs_init(struct intel_gvt *gvt)
+void intel_gvt_debugfs_init(struct intel_gvt *gvt)
 {
        struct drm_minor *minor = gvt->dev_priv->drm.primary;
-       struct dentry *ent;
 
        gvt->debugfs_root = debugfs_create_dir("gvt", minor->debugfs_root);
-       if (!gvt->debugfs_root) {
-               gvt_err("Cannot create debugfs dir\n");
-               return -ENOMEM;
-       }
 
-       ent = debugfs_create_ulong("num_tracked_mmio", 0444, gvt->debugfs_root,
-                                  &gvt->mmio.num_tracked_mmio);
-       if (!ent)
-               return -ENOMEM;
-
-       return 0;
+       debugfs_create_ulong("num_tracked_mmio", 0444, gvt->debugfs_root,
+                            &gvt->mmio.num_tracked_mmio);
 }
 
 /**

diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c
index 43f4242062dd8e613ca4003d743e7ea769bc7f65..8f37eefa0a028d0c17c28555482edad8d2af6f1c 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gvt.c
+++ b/drivers/gpu/drm/i915/gvt/gvt.c
@@ -375,9 +375,7 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv)
        }
        gvt->idle_vgpu = vgpu;
 
-       ret = intel_gvt_debugfs_init(gvt);
-       if (ret)
-               gvt_err("debugfs registration failed, go on.\n");
+       intel_gvt_debugfs_init(gvt);
 
        gvt_dbg_core("gvt device initialization is done\n");
        dev_priv->gvt = gvt;

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 7a1fe44d45af4a2c547d9b1ec55a8d82f400f0c2..3ff59dcf697788494573228f0d21b828cb8d01c8 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -682,9 +682,9 @@ static inline void intel_gvt_mmio_set_in_ctx(
        gvt->mmio.mmio_attribute[offset >> 2] |= F_IN_CTX;
 }
 
-int intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu);
+void intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu);
 void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);
-int intel_gvt_debugfs_init(struct intel_gvt *gvt);
+void intel_gvt_debugfs_init(struct intel_gvt *gvt);
 void intel_gvt_debugfs_clean(struct intel_gvt *gvt);
 
 

diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 9674738b89df9fdb4ebb2e9d9c3d96c8174d93c6..d91136b39dad3080f8490b03178adc3a6009d65a 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -1796,9 +1796,6 @@ static int kvmgt_guest_init(struct mdev_device *mdev)
                                                "kvmgt_nr_cache_entries",
                                                0444, vgpu->debugfs,
                                                &vgpu->vdev.nr_cache_entries);
-       if (!info->debugfs_cache_entries)
-               gvt_vgpu_err("Cannot create kvmgt debugfs entry\n");
-
        return 0;
 }
 

diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index 44ce3c2b9ac13a586075366f15661b13559ca7d9..d5a6e4e3d0fd7a10f6685d5e8b0365c915eb12fa 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -420,9 +420,7 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt,
        if (ret)
                goto out_clean_submission;
 
-       ret = intel_gvt_debugfs_add_vgpu(vgpu);
-       if (ret)
-               goto out_clean_sched_policy;
+       intel_gvt_debugfs_add_vgpu(vgpu);
 
        ret = intel_gvt_hypervisor_set_opregion(vgpu);
        if (ret)