From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964981AbbFJSQo (ORCPT ); Wed, 10 Jun 2015 14:16:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48504 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934176AbbFJSNq (ORCPT ); Wed, 10 Jun 2015 14:13:46 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Adrian Hunter , Andi Kleen , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Stephane Eranian Subject: [PATCH 22/25] perf stat: Remove perf_evsel__read_cb function Date: Wed, 10 Jun 2015 20:10:55 +0200 Message-Id: <1433959858-31858-23-git-send-email-jolsa@kernel.org> In-Reply-To: <1433959858-31858-1-git-send-email-jolsa@kernel.org> References: <1433959858-31858-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's no longer used, the stat command uses perf_evsel__read now. Link: http://lkml.kernel.org/n/tip-5yh5pg1mw9wefhup1vvtssh9@git.kernel.org Signed-off-by: Jiri Olsa --- 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 c1d210f8e799..ea76f821a251 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1044,22 +1044,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 9609df91abc1..d1f894ea6520 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -268,13 +268,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); -- 1.9.3