| Message ID | 20230120110658.1083757-1-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/debugfs: Get rid of single use macros. | expand |
On Fri, Jan 20, 2023 at 06:06:58AM -0500, Rodrigo Vivi wrote: > No good reason for these indirection cases. Agree! One time use definitions should be avoided, they just add complexity. > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Thanks Andi > --- > drivers/gpu/drm/i915/i915_debugfs.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 51ba9a8369c5..45773ce1deac 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -649,15 +649,13 @@ i915_drop_caches_get(void *data, u64 *val) > return 0; > } > > -#define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */ > - > static int > gt_drop_caches(struct intel_gt *gt, u64 val) > { > int ret; > > if (val & DROP_RESET_ACTIVE && > - wait_for(intel_engines_are_idle(gt), I915_IDLE_ENGINES_TIMEOUT)) > + wait_for(intel_engines_are_idle(gt), 200)) > intel_gt_set_wedged(gt); > > if (val & DROP_RETIRE) > @@ -765,7 +763,6 @@ static const struct drm_info_list i915_debugfs_list[] = { > {"i915_sseu_status", i915_sseu_status, 0}, > {"i915_rps_boost_info", i915_rps_boost_info, 0}, > }; > -#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) > > static const struct i915_debugfs_files { > const char *name; > @@ -798,6 +795,6 @@ void i915_debugfs_register(struct drm_i915_private *dev_priv) > } > > drm_debugfs_create_files(i915_debugfs_list, > - I915_DEBUGFS_ENTRIES, > + ARRAY_SIZE(i915_debugfs_list), > minor->debugfs_root, minor); > } > -- > 2.39.0
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 51ba9a8369c5..45773ce1deac 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -649,15 +649,13 @@ i915_drop_caches_get(void *data, u64 *val) return 0; } -#define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */ - static int gt_drop_caches(struct intel_gt *gt, u64 val) { int ret; if (val & DROP_RESET_ACTIVE && - wait_for(intel_engines_are_idle(gt), I915_IDLE_ENGINES_TIMEOUT)) + wait_for(intel_engines_are_idle(gt), 200)) intel_gt_set_wedged(gt); if (val & DROP_RETIRE) @@ -765,7 +763,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_sseu_status", i915_sseu_status, 0}, {"i915_rps_boost_info", i915_rps_boost_info, 0}, }; -#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) static const struct i915_debugfs_files { const char *name; @@ -798,6 +795,6 @@ void i915_debugfs_register(struct drm_i915_private *dev_priv) } drm_debugfs_create_files(i915_debugfs_list, - I915_DEBUGFS_ENTRIES, + ARRAY_SIZE(i915_debugfs_list), minor->debugfs_root, minor); }
No good reason for these indirection cases. Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)