From: jdzheng@broadcom•com (Jiandong Zheng)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/9] ARM: pmu: remove arm_pmu_type enumeration
Date: Mon, 13 Aug 2012 14:57:12 -0700 [thread overview]
Message-ID: <50297838.7080208@broadcom.com> (raw)
In-Reply-To: <1344620195-22372-5-git-send-email-will.deacon@arm.com>
On 8/10/2012 10:36 AM, Will Deacon wrote:
> From: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm•com>
>
> The arm_pmu_type enumeration was initially introduced to identify
> different PMU types in the system, the usual one being that on the CPU
> (ARM_PMU_DEVICE_CPU). With the removal of the PMU reservation code and
> the introduction of devicetree bindings for the CPU PMU, the enumeration
> is no longer required.
>
> This patch removes the enumeration and updates the various CPU PMU
> platform devices so that they no longer pass an .id field referring
> to identify the PMU type.
>
> Cc: JD Zheng <jdzheng@broadcom•com>
> Cc: Jon Hunter <jon-hunter@ti•com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail•com>
> Cc: Olof Johansson <olof@lixom•net>
> Cc: Linus Walleij <linus.walleij@stericsson•com>
> Cc: Kukjin Kim <kgene.kim@samsung•com>
> Cc: Pawel Moll <pawel.moll@arm•com>
> Signed-off-by: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm•com>
> [will: cosmetic edits and actual removal of the enum type]
> Signed-off-by: Will Deacon <will.deacon@arm•com>
> ---
> arch/arm/include/asm/pmu.h | 10 ----------
> arch/arm/mach-bcmring/arch.c | 3 +--
> arch/arm/mach-omap2/devices.c | 3 +--
> arch/arm/mach-pxa/devices.c | 3 +--
> arch/arm/mach-realview/realview_eb.c | 3 +--
> arch/arm/mach-realview/realview_pb1176.c | 3 +--
> arch/arm/mach-realview/realview_pb11mp.c | 3 +--
> arch/arm/mach-realview/realview_pba8.c | 3 +--
> arch/arm/mach-realview/realview_pbx.c | 3 +--
> arch/arm/mach-tegra/devices.c | 3 +--
> arch/arm/mach-ux500/cpu-db8500.c | 3 +--
> arch/arm/mach-vexpress/ct-ca9x4.c | 3 +--
> arch/arm/plat-iop/pmu.c | 3 +--
> arch/arm/plat-samsung/devs.c | 3 +--
> 14 files changed, 13 insertions(+), 36 deletions(-)
>
> diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h
> index 05e0401..fbec73a 100644
> --- a/arch/arm/include/asm/pmu.h
> +++ b/arch/arm/include/asm/pmu.h
> @@ -16,15 +16,6 @@
> #include <linux/perf_event.h>
>
> /*
> - * Types of PMUs that can be accessed directly and require mutual
> - * exclusion between profiling tools.
> - */
> -enum arm_pmu_type {
> - ARM_PMU_DEVICE_CPU = 0,
> - ARM_NUM_PMU_DEVICES,
> -};
> -
> -/*
> * struct arm_pmu_platdata - ARM PMU platform data
> *
> * @handle_irq: an optional handler which will be called from the
> @@ -73,7 +64,6 @@ struct pmu_hw_events {
>
> struct arm_pmu {
> struct pmu pmu;
> - enum arm_pmu_type type;
> cpumask_t active_irqs;
> char *name;
> irqreturn_t (*handle_irq)(int irq_num, void *dev);
> diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
> index 45c97b1..76e7953 100644
> --- a/arch/arm/mach-bcmring/arch.c
> +++ b/arch/arm/mach-bcmring/arch.c
> @@ -29,7 +29,6 @@
> #include <asm/setup.h>
> #include <asm/mach-types.h>
> #include <asm/mach/time.h>
> -#include <asm/pmu.h>
>
> #include <asm/mach/arch.h>
> #include <mach/dma.h>
> @@ -116,7 +115,7 @@ static struct resource pmu_resource = {
>
> static struct platform_device pmu_device = {
> .name = "arm-pmu",
> - .id = ARM_PMU_DEVICE_CPU,
> + .id = -1,
> .resource = &pmu_resource,
> .num_resources = 1,
> };
>
Isn't it clearer to define a meaningful name for "-1", esp. if "-1" is
being checked somewhere else?
Regards,
JD
next prev parent reply other threads:[~2012-08-13 21:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 17:36 [PATCH 0/9] ARM perf updates for 3.7 Will Deacon
2012-08-10 17:36 ` [PATCH 1/9] ARM: PMU: Add runtime PM Support Will Deacon
2012-08-11 15:09 ` Ming Lei
2012-08-13 10:40 ` Will Deacon
2012-08-16 13:56 ` Jon Hunter
2012-08-10 17:36 ` [PATCH 2/9] ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs Will Deacon
2012-08-10 18:42 ` Rob Herring
2012-08-10 17:36 ` [PATCH 3/9] ARM: pmu: remove unused reservation mechanism Will Deacon
2012-08-10 17:36 ` [PATCH 4/9] ARM: pmu: remove arm_pmu_type enumeration Will Deacon
2012-08-13 14:17 ` Linus Walleij
2012-08-13 21:57 ` Jiandong Zheng [this message]
2012-08-14 8:43 ` Sudeep KarkadaNagesha
2012-08-14 16:53 ` Jiandong Zheng
2012-08-16 13:59 ` Jon Hunter
2012-08-17 14:08 ` Jon Hunter
2012-08-20 9:01 ` Will Deacon
2012-08-20 13:05 ` Jon Hunter
2012-08-23 5:45 ` Kukjin Kim
2012-08-10 17:36 ` [PATCH 5/9] ARM: perf: remove mysterious compiler barrier Will Deacon
2012-08-10 17:36 ` [PATCH 6/9] ARM: perf: probe devicetree in preference to current CPU Will Deacon
2012-08-10 17:36 ` [PATCH 7/9] ARM: perf: prepare for moving CPU PMU code into separate file Will Deacon
2012-08-10 17:36 ` [PATCH 8/9] ARM: perf: move CPU-specific PMU handling " Will Deacon
2012-08-10 17:36 ` [PATCH 9/9] ARM: perf: move irq registration into pmu implementation Will Deacon
2012-08-13 9:11 ` [PATCH 0/9] ARM perf updates for 3.7 Hui Wang
2012-08-13 9:32 ` Will Deacon
2012-08-14 1:46 ` Hui Wang
2013-02-28 6:54 ` i.MX6Quad PMU irq handling (was: Re: [PATCH 0/9] ARM perf updates for 3.7) Dirk Behme
2013-02-28 7:27 ` Shawn Guo
2013-02-28 7:38 ` i.MX6Quad PMU irq handling Hui Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50297838.7080208@broadcom.com \
--to=jdzheng@broadcom$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox