From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752702AbcGSGuT (ORCPT ); Tue, 19 Jul 2016 02:50:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44118 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265AbcGSGuN (ORCPT ); Tue, 19 Jul 2016 02:50:13 -0400 Date: Mon, 18 Jul 2016 23:49:41 -0700 From: tip-bot for Dan Carpenter Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, acme@redhat.com, eranian@google.com, alexander.shishkin@linux.intel.com, peterz@infradead.org, tglx@linutronix.de, adrian.hunter@intel.com Reply-To: peterz@infradead.org, tglx@linutronix.de, adrian.hunter@intel.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, acme@redhat.com, eranian@google.com, alexander.shishkin@linux.intel.com In-Reply-To: <20160715210836.GB19522@mwanda> References: <20160715210836.GB19522@mwanda> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf jit: Remove some no-op error handling Git-Commit-ID: 9fcfcdf3c7b613c0d9536f57587456411b8a4e33 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9fcfcdf3c7b613c0d9536f57587456411b8a4e33 Gitweb: http://git.kernel.org/tip/9fcfcdf3c7b613c0d9536f57587456411b8a4e33 Author: Dan Carpenter AuthorDate: Sat, 16 Jul 2016 00:08:36 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 Jul 2016 12:20:00 -0300 perf jit: Remove some no-op error handling The 'info.e_machine' struct member is an uint16_t so 'm' is never less than zero. It looks like this was maybe left over code from earlier versions so I've just removed it. Signed-off-by: Dan Carpenter Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Peter Zijlstra Cc: Stephane Eranian Cc: kernel-janitors@vger.kernel.org Link: http://lkml.kernel.org/r/20160715210836.GB19522@mwanda Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/jvmti/jvmti_agent.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c index 91bf333..55daeff 100644 --- a/tools/perf/jvmti/jvmti_agent.c +++ b/tools/perf/jvmti/jvmti_agent.c @@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr) ssize_t sret; char id[16]; int fd, ret = -1; - int m = -1; struct { uint16_t e_type; uint16_t e_machine; @@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr) if (sret != sizeof(info)) goto error; - m = info.e_machine; - if (m < 0) - m = 0; /* ELF EM_NONE */ - - hdr->elf_mach = m; + hdr->elf_mach = info.e_machine; ret = 0; error: close(fd);