From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400AbdDKJBO (ORCPT ); Tue, 11 Apr 2017 05:01:14 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:40980 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754378AbdDKJBL (ORCPT ); Tue, 11 Apr 2017 05:01:11 -0400 Date: Tue, 11 Apr 2017 11:59:49 +0300 From: Dan Carpenter To: Peter Zijlstra Cc: Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] perf/core: Remove some dead code Message-ID: <20170411085949.GB24157@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/kernel/events/core.c b/kernel/events/core.c index 6e75a5c9412d..0028efa0abc3 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -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; }