perf jit: Remove some no-op error handling
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 15 Jul 2016 21:08:36 +0000 (00:08 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 18 Jul 2016 15:20:00 +0000 (12:20 -0300)
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 <dan.carpenter@oracle.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20160715210836.GB19522@mwanda
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/jvmti/jvmti_agent.c

index 91bf333a366a43ccb2c5905592e0492268c58b1f..55daefff0d54daae31f6b1134a6a499792a310d7 100644 (file)
@@ -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);