From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbcGOVJV (ORCPT ); Fri, 15 Jul 2016 17:09:21 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:19748 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751430AbcGOVJT (ORCPT ); Fri, 15 Jul 2016 17:09:19 -0400 Date: Sat, 16 Jul 2016 00:08:36 +0300 From: Dan Carpenter To: Peter Zijlstra , Stephane Eranian Cc: Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Adrian Hunter , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch 2/2] perf jit: remove some no-op error handling Message-ID: <20160715210836.GB19522@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 info.e_machine is a 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 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);