perf/core: Remove some dead code

PATCH Superseded Dan Carpenter 1 participant 1 message Apr 11, 2017

Subsystems (2)

Kernel janitors perf events

lore

Share & tools

lore

Dan Carpenter

author

2017-04-11 08:59 UTC #0 lore raw

PATCH 1/1 perf/core: Remove some dead code

perf_init_event() never returns NULL, only error pointer. The check for NULL causes a static checker warning and it seems slightly buggy to do a goto err_ns without setting the error code so those are two other reasons to delete this.

Signed-off-by Dan Carpenter <[email protected]>

kernel/events/core.c +2 -4

index 6e75a5c9412d..0028efa0abc3 100644
@@ -9172,7 +9172,7 @@ static int perf_try_init_event(struct pmu *pmu, struct perf_event *event)
 
 static struct pmu *perf_init_event(struct perf_event *event)
 {
-	struct pmu *pmu = NULL;
+	struct pmu *pmu;
 	int idx;
 	int ret;

@@ -9456,9 +9456,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
 	}
 
 	pmu = perf_init_event(event);
-	if (!pmu)
-		goto err_ns;
-	else if (IS_ERR(pmu)) {
+	if (IS_ERR(pmu)) {
 		err = PTR_ERR(pmu);
 		goto err_ns;
 	}