Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df3d17e0 authored by Sudeep KarkadaNagesha's avatar Sudeep KarkadaNagesha Committed by Will Deacon
Browse files

ARM: pmu: remove arm_pmu_type enumeration 



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: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Pawel Moll <pawel.moll@arm.com>
Acked-by: default avatarJon Hunter <jon-hunter@ti.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: default avatarSudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>
[will: cosmetic edits and actual removal of the enum type]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent f0d1bc47

arch/arm/include/asm/pmu.h

+0 −10
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
#include <linux/interrupt.h>

#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

 *
@@ -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);

arch/arm/mach-bcmring/arch.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-omap2/devices.c

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <mach/irqs.h>

#include <asm/mach-types.h>

#include <asm/mach/map.h>

#include <asm/pmu.h>



#include "iomap.h"

#include <plat/board.h>
@@ -448,7 +447,7 @@ static struct resource omap3_pmu_resource = { 


static struct platform_device omap_pmu_device = {

	.name		= "arm-pmu",

	.id		= ARM_PMU_DEVICE_CPU,

	.id		= -1,

	.num_resources	= 1,

};

arch/arm/mach-pxa/devices.c

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/spi/pxa2xx_spi.h>

#include <linux/i2c/pxa-i2c.h>



#include <asm/pmu.h>

#include <mach/udc.h>

#include <mach/pxa3xx-u2d.h>

#include <mach/pxafb.h>
@@ -42,7 +41,7 @@ static struct resource pxa_resource_pmu = { 


struct platform_device pxa_device_pmu = {

	.name		= "arm-pmu",

	.id		= ARM_PMU_DEVICE_CPU,

	.id		= -1,

	.resource	= &pxa_resource_pmu,

	.num_resources	= 1,

};

arch/arm/mach-realview/realview_eb.c

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/pgtable.h>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>
@@ -297,7 +296,7 @@ static struct resource pmu_resources[] = { 


static struct platform_device pmu_device = {

	.name			= "arm-pmu",

	.id			= ARM_PMU_DEVICE_CPU,

	.id			= -1,

	.num_resources		= ARRAY_SIZE(pmu_resources),

	.resource		= pmu_resources,

};