perf/x86/intel/uncore: Drop unnecessary NULL checks after container_of()
authorGuenter Roeck <linux@roeck-us.net>
Mon, 10 May 2021 22:48:49 +0000 (15:48 -0700)
committerIngo Molnar <mingo@kernel.org>
Wed, 12 May 2021 08:44:21 +0000 (10:44 +0200)
The parameter passed to the pmu_enable() and pmu_disable() functions can not be
NULL because it is dereferenced by the caller.

That means the result of container_of() on that parameter can also never be NULL.
The existing NULL checks are therefore unnecessary and misleading. Remove them.

This change was made automatically with the following Coccinelle script.

  @@
  type t;
  identifier v;
  statement s;
  @@

  <+...
  (
    t v = container_of(...);
  |
    v = container_of(...);
  )
    ...
    when != v
  - if (\( !v \| v == NULL \) ) s
  ...+>

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210510224849.2349861-1-linux@roeck-us.net
arch/x86/events/intel/uncore.c

index df7b07d..9bf4dbb 100644 (file)
@@ -801,8 +801,6 @@ static void uncore_pmu_enable(struct pmu *pmu)
        struct intel_uncore_box *box;
 
        uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu);
-       if (!uncore_pmu)
-               return;
 
        box = uncore_pmu_to_box(uncore_pmu, smp_processor_id());
        if (!box)
@@ -818,8 +816,6 @@ static void uncore_pmu_disable(struct pmu *pmu)
        struct intel_uncore_box *box;
 
        uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu);
-       if (!uncore_pmu)
-               return;
 
        box = uncore_pmu_to_box(uncore_pmu, smp_processor_id());
        if (!box)