Skip to content

Commit

Permalink
drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
Browse files Browse the repository at this point in the history
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.

Prefer drm_WARN_ON over WARN_ON.

Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200504181600.18503-8-pankaj.laxminarayan.bharadiya@intel.com
  • Loading branch information
Pankaj Bharadiya authored and Jani Nikula committed May 19, 2020
1 parent 7bda100 commit bf07f6e
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/gpu/drm/i915/i915_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit bf07f6e

Please sign in to comment.