drm/i915/pmu: rearrange hrtimer pointer chasing
authorJani Nikula <jani.nikula@intel.com>
Mon, 23 Oct 2023 15:02:56 +0000 (18:02 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 30 Oct 2023 16:21:09 +0000 (18:21 +0200)
Do the logical step of first getting from struct hrtimer to struct
i915_pmu, and then from struct i915_pmu to struct drm_i915_private,
instead of hrtimer->i915->pmu.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231023150256.438331-3-jani.nikula@intel.com
drivers/gpu/drm/i915/i915_pmu.c

index 5c3c480886dbe06de0bf31fe317d1b5184c2ce3c..878a27e1c8effa59fc85732715b6b9abd4468599 100644 (file)
@@ -478,9 +478,8 @@ frequency_sample(struct intel_gt *gt, unsigned int period_ns)
 
 static enum hrtimer_restart i915_sample(struct hrtimer *hrtimer)
 {
-       struct drm_i915_private *i915 =
-               container_of(hrtimer, struct drm_i915_private, pmu.timer);
-       struct i915_pmu *pmu = &i915->pmu;
+       struct i915_pmu *pmu = container_of(hrtimer, struct i915_pmu, timer);
+       struct drm_i915_private *i915 = pmu_to_i915(pmu);
        unsigned int period_ns;
        struct intel_gt *gt;
        unsigned int i;