drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_pmu.c

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index e991a707bdb758c29fb1a7f782c92abaa7525305..f6f44ad5e3354ff2b4d50ba51aef3138fac88a59 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -441,7 +441,11 @@ static u64 count_interrupts(struct drm_i915_private *i915)
 
 static void i915_pmu_event_destroy(struct perf_event *event)
 {
-       WARN_ON(event->parent);
+       struct drm_i915_private *i915 =
+               container_of(event->pmu, typeof(*i915), pmu.base);
+
+       drm_WARN_ON(&i915->drm, event->parent);
+
        module_put(THIS_MODULE);
 }
 
@@ -1058,8 +1062,10 @@ static int i915_pmu_register_cpuhp_state(struct i915_pmu *pmu)
 
 static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu)
 {
-       WARN_ON(pmu->cpuhp.slot == CPUHP_INVALID);
-       WARN_ON(cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
+       struct drm_i915_private *i915 = container_of(pmu, typeof(*i915), pmu);
+
+       drm_WARN_ON(&i915->drm, pmu->cpuhp.slot == CPUHP_INVALID);
+       drm_WARN_ON(&i915->drm, cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
        cpuhp_remove_multi_state(pmu->cpuhp.slot);
        pmu->cpuhp.slot = CPUHP_INVALID;
 }