From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754237AbbF3E6S (ORCPT ); Tue, 30 Jun 2015 00:58:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38698 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754306AbbF3E5x (ORCPT ); Tue, 30 Jun 2015 00:57:53 -0400 Date: Mon, 29 Jun 2015 21:57:37 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: a.p.zijlstra@chello.nl, mingo@kernel.org, dsahern@gmail.com, hpa@zytor.com, ak@linux.intel.com, acme@redhat.com, eranian@google.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, namhyung@kernel.org Reply-To: jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, ak@linux.intel.com, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, eranian@google.com, acme@redhat.com In-Reply-To: <1435310967-14570-19-git-send-email-jolsa@kernel.org> References: <1435310967-14570-19-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf stat: Remove perf_evsel__read_cb function Git-Commit-ID: d8ee3b54d0458cbed0a31a410458f4bfd38fc147 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: d8ee3b54d0458cbed0a31a410458f4bfd38fc147 Gitweb: http://git.kernel.org/tip/d8ee3b54d0458cbed0a31a410458f4bfd38fc147 Author: Jiri Olsa AuthorDate: Fri, 26 Jun 2015 11:29:23 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 26 Jun 2015 11:50:51 -0300 perf stat: Remove perf_evsel__read_cb function It's no longer used, the stat command uses perf_evsel__read now. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1435310967-14570-19-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 16 ---------------- tools/perf/util/evsel.h | 7 ------- 2 files changed, 23 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2e0a4e0..2936b30 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -939,22 +939,6 @@ void perf_counts_values__scale(struct perf_counts_values *count, *pscaled = scaled; } -int perf_evsel__read_cb(struct perf_evsel *evsel, int cpu, int thread, - perf_evsel__read_cb_t cb) -{ - struct perf_counts_values count; - - memset(&count, 0, sizeof(count)); - - if (FD(evsel, cpu, thread) < 0) - return -EINVAL; - - if (readn(FD(evsel, cpu, thread), &count, sizeof(count)) < 0) - return -errno; - - return cb(evsel, cpu, thread, &count); -} - int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread, struct perf_counts_values *count) { diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a79944a..4a7ed56 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -229,13 +229,6 @@ static inline bool perf_evsel__match2(struct perf_evsel *e1, (a)->attr.type == (b)->attr.type && \ (a)->attr.config == (b)->attr.config) -typedef int (perf_evsel__read_cb_t)(struct perf_evsel *evsel, - int cpu, int thread, - struct perf_counts_values *count); - -int perf_evsel__read_cb(struct perf_evsel *evsel, int cpu, int thread, - perf_evsel__read_cb_t cb); - int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread, struct perf_counts_values *count);