Ping... Lucas, do you mind merging this trivial refactoring?

Thanks, Andi

On Sat, Nov 27, 2021 at 03:17:15AM +0200, Andi Shyti wrote:

Change functions that always return '0' to be void type.

Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Cc: Maciej Patelczyk maciej.patelczyk@intel.com

---

drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 7 ++++--- drivers/gpu/drm/i915/gt/intel_gt_debugfs.h | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 16 ++++++++-------- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h | 4 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 12 +++++++++--- 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c index f103664b71d4..53b90b4f73d7 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c @@ -29,7 +29,7 @@ int intel_gt_debugfs_reset_show(struct intel_gt *gt, u64 *val) } }

-int intel_gt_debugfs_reset_store(struct intel_gt *gt, u64 val) +void intel_gt_debugfs_reset_store(struct intel_gt *gt, u64 val) { /* Flush any previous reset before applying for a new one */ wait_event(gt->reset.queue, @@ -37,7 +37,6 @@ int intel_gt_debugfs_reset_store(struct intel_gt *gt, u64 val)

intel_gt_handle_error(gt, val, I915_ERROR_CAPTURE, "Manually reset engine mask to %llx", val);

• return 0;

}

/* @@ -51,7 +50,9 @@ static int __intel_gt_debugfs_reset_show(void *data, u64 *val)

static int __intel_gt_debugfs_reset_store(void *data, u64 val) {

• return intel_gt_debugfs_reset_store(data, val);

• intel_gt_debugfs_reset_store(data, val);
• return 0;

}

DEFINE_SIMPLE_ATTRIBUTE(reset_fops, __intel_gt_debugfs_reset_show, diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h index e307ceb99031..a4baf8e7f068 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h @@ -37,6 +37,6 @@ void intel_gt_debugfs_register_files(struct dentry *root,

/* functions that need to be accessed by the upper level non-gt interfaces */ int intel_gt_debugfs_reset_show(struct intel_gt *gt, u64 *val); -int intel_gt_debugfs_reset_store(struct intel_gt *gt, u64 val); +void intel_gt_debugfs_reset_store(struct intel_gt *gt, u64 val);

#endif /* INTEL_GT_DEBUGFS_H */ diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c index 404dfa7673c6..7a30157aa9d3 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c @@ -20,38 +20,38 @@ #include "intel_uncore.h" #include "vlv_sideband.h"

-int intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt) +void intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt) { atomic_inc(&gt->user_wakeref); intel_gt_pm_get(gt); if (GRAPHICS_VER(gt->i915) >= 6) intel_uncore_forcewake_user_get(gt->uncore);

• return 0;

}

-int intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt) +void intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt) { if (GRAPHICS_VER(gt->i915) >= 6) intel_uncore_forcewake_user_put(gt->uncore); intel_gt_pm_put(gt); atomic_dec(&gt->user_wakeref);

• return 0;

}

static int forcewake_user_open(struct inode *inode, struct file *file) { struct intel_gt *gt = inode->i_private;

• return intel_gt_pm_debugfs_forcewake_user_open(gt);

• intel_gt_pm_debugfs_forcewake_user_open(gt);
• return 0;

}

static int forcewake_user_release(struct inode *inode, struct file *file) { struct intel_gt *gt = inode->i_private;

• return intel_gt_pm_debugfs_forcewake_user_release(gt);

• intel_gt_pm_debugfs_forcewake_user_release(gt);
• return 0;

}

static const struct file_operations forcewake_user_fops = { diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h index a8457887ec65..0ace8c2da0ac 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h @@ -14,7 +14,7 @@ void intel_gt_pm_debugfs_register(struct intel_gt *gt, struct dentry *root); void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *m);

/* functions that need to be accessed by the upper level non-gt interfaces */ -int intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt); -int intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt); +void intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt); +void intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt);

#endif /* INTEL_GT_PM_DEBUGFS_H */ diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index fe638b5da7c0..88ef63f05ead 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -565,7 +565,9 @@ static int i915_wedged_set(void *data, u64 val) { struct drm_i915_private *i915 = data;

• return intel_gt_debugfs_reset_store(&i915->gt, val);

• intel_gt_debugfs_reset_store(&i915->gt, val);
• return 0;

}

DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops, @@ -711,14 +713,18 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) { struct drm_i915_private *i915 = inode->i_private;

• return intel_gt_pm_debugfs_forcewake_user_open(&i915->gt);

• intel_gt_pm_debugfs_forcewake_user_open(&i915->gt);
• return 0;

}

static int i915_forcewake_release(struct inode *inode, struct file *file) { struct drm_i915_private *i915 = inode->i_private;

• return intel_gt_pm_debugfs_forcewake_user_release(&i915->gt);

• intel_gt_pm_debugfs_forcewake_user_release(&i915->gt);
• return 0;

}

static const struct file_operations i915_forcewake_fops = {

2.34.0