[tip:,perf/core] perf/x86/intel/uncore: Drop unnecessary NULL checks after container_of()
diff mbox series

Message ID 162080926219.29796.17403001869463771532.tip-bot2@tip-bot2
State In Next
Commit 440e906702410f59ae5397ec9e3b639edb53f80e
Headers show
Series
  • [tip:,perf/core] perf/x86/intel/uncore: Drop unnecessary NULL checks after container_of()
Related show

Commit Message

tip-bot2 for Thomas Gleixner May 12, 2021, 8:47 a.m. UTC
The following commit has been merged into the perf/core branch of tip:

Commit-ID:     440e906702410f59ae5397ec9e3b639edb53f80e
Gitweb:        https://git.kernel.org/tip/440e906702410f59ae5397ec9e3b639edb53f80e
Author:        Guenter Roeck <linux@roeck-us.net>
AuthorDate:    Mon, 10 May 2021 15:48:49 -07:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 12 May 2021 10:44:21 +02:00

perf/x86/intel/uncore: Drop unnecessary NULL checks after container_of()

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 | 4 ----
 1 file changed, 4 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index df7b07d..9bf4dbb 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -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)