From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755028AbbETQJI (ORCPT ); Wed, 20 May 2015 12:09:08 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:36837 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754335AbbETQJH (ORCPT ); Wed, 20 May 2015 12:09:07 -0400 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , Adrian Hunter , David Ahern Subject: [PATCH v2 2/3] perf tools: Get rid of dso__data_fd() from dso__data_size() Date: Thu, 21 May 2015 01:03:40 +0900 Message-Id: <1432137821-10853-2-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1432137821-10853-1-git-send-email-namhyung@kernel.org> References: <1432137821-10853-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It seems that the dso__data_fd() was needed to find a binary type since open in data_file_size() alone used to fail. But as it can open the dso fine now, the dso__data_fd() can go away. Cc: Adrian Hunter Signed-off-by: Namhyung Kim --- tools/perf/util/dso.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 516e0c25ea16..e95e850dd832 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -745,12 +745,6 @@ out: */ off_t dso__data_size(struct dso *dso, struct machine *machine) { - int fd; - - fd = dso__data_fd(dso, machine); - if (fd < 0) - return fd; - if (data_file_size(dso, machine)) return -1; -- 2.4.0