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

Commit 7fdd3c49 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

ARM: perf: make name of arm_pmu_type consistent 



Commit f12482c9 ("ARM: 6974/1: pmu: refactor reservation") changed
{release,reserve}_pmu to take an enum arm_pmu_type as a parameter, but
inconsistently named the parameter `type' or `device'. It would be nice
if these were consistent.

This patch makes use of enum arm_pmu_type consistent, always using
`type'. Related printks are updated, explicitly mentioning `type' also.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 49bef833

arch/arm/include/asm/pmu.h

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct arm_pmu_platdata { 
 * encoded error on failure.

 */

extern struct platform_device *

reserve_pmu(enum arm_pmu_type device);

reserve_pmu(enum arm_pmu_type type);



/**

 * release_pmu() - Relinquish control of the performance counters
@@ -62,26 +62,26 @@ release_pmu(enum arm_pmu_type type); 
 * the actual hardware initialisation.

 */

extern int

init_pmu(enum arm_pmu_type device);

init_pmu(enum arm_pmu_type type);



#else /* CONFIG_CPU_HAS_PMU */



#include <linux/err.h>



static inline struct platform_device *

reserve_pmu(enum arm_pmu_type device)

reserve_pmu(enum arm_pmu_type type)

{

	return ERR_PTR(-ENODEV);

}



static inline int

release_pmu(enum arm_pmu_type device)

release_pmu(enum arm_pmu_type type)

{

	return -ENODEV;

}



static inline int

init_pmu(enum arm_pmu_type device)

init_pmu(enum arm_pmu_type type)

{

	return -ENODEV;

}

arch/arm/kernel/pmu.c

+13 −13
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int __devinit pmu_register(struct platform_device *pdev, 
{

	if (type < 0 || type >= ARM_NUM_PMU_DEVICES) {

		pr_warning("received registration request for unknown "

				"device %d\n", type);

				"PMU device type %d\n", type);

		return -EINVAL;

	}
@@ -112,17 +112,17 @@ static int __init register_pmu_driver(void) 
device_initcall(register_pmu_driver);



struct platform_device *

reserve_pmu(enum arm_pmu_type device)

reserve_pmu(enum arm_pmu_type type)

{

	struct platform_device *pdev;



	if (test_and_set_bit_lock(device, &pmu_lock)) {

	if (test_and_set_bit_lock(type, &pmu_lock)) {

		pdev = ERR_PTR(-EBUSY);

	} else if (pmu_devices[device] == NULL) {

		clear_bit_unlock(device, &pmu_lock);

	} else if (pmu_devices[type] == NULL) {

		clear_bit_unlock(type, &pmu_lock);

		pdev = ERR_PTR(-ENODEV);

	} else {

		pdev = pmu_devices[device];

		pdev = pmu_devices[type];

	}



	return pdev;
@@ -130,11 +130,11 @@ reserve_pmu(enum arm_pmu_type device) 
EXPORT_SYMBOL_GPL(reserve_pmu);



int

release_pmu(enum arm_pmu_type device)

release_pmu(enum arm_pmu_type type)

{

	if (WARN_ON(!pmu_devices[device]))

	if (WARN_ON(!pmu_devices[type]))

		return -EINVAL;

	clear_bit_unlock(device, &pmu_lock);

	clear_bit_unlock(type, &pmu_lock);

	return 0;

}

EXPORT_SYMBOL_GPL(release_pmu);
@@ -182,17 +182,17 @@ init_cpu_pmu(void) 
}



int

init_pmu(enum arm_pmu_type device)

init_pmu(enum arm_pmu_type type)

{

	int err = 0;



	switch (device) {

	switch (type) {

	case ARM_PMU_DEVICE_CPU:

		err = init_cpu_pmu();

		break;

	default:

		pr_warning("attempt to initialise unknown device %d\n",

				device);

		pr_warning("attempt to initialise PMU of unknown "

			   "type %d\n", type);

		err = -EINVAL;

	}