Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1316516

[PATCH v6 05/12] arm-cci: write_counter: Remove redundant check

Show all headers | View raw

pmu_write_counter() is now only called from pmu_write_counters(),
which does so for each set index in the given mask, bounded by
cci_pmu->num_cntrs. So, there is no need for an extra check to
make sure the given counter is valid inside pmu_write_counter.
This patch gets rid of that.

Cc: Punit Agrawal <punit.agrawal@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
---
 drivers/bus/arm-cci.c |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index df04b625..4710d51 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -814,16 +814,9 @@ static u32 pmu_read_counter(struct perf_event *event)
 	return value;
 }
 
-static void pmu_write_counter(struct perf_event *event, u32 value)
+static void pmu_write_counter(struct cci_pmu *cci_pmu, u32 value, int idx)
 {
-	struct cci_pmu *cci_pmu = to_cci_pmu(event->pmu);
-	struct hw_perf_event *hw_counter = &event->hw;
-	int idx = hw_counter->idx;
-
-	if (unlikely(!pmu_is_valid_counter(cci_pmu, idx)))
-		dev_err(&cci_pmu->plat_device->dev, "Invalid CCI PMU counter %d\n", idx);
-	else
-		pmu_write_register(cci_pmu, value, idx, CCI_PMU_CNTR);
+	pmu_write_register(cci_pmu, value, idx, CCI_PMU_CNTR);
 }
 
 static void pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask)
@@ -836,7 +829,7 @@ static void pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask)
 
 		if (WARN_ON(!event))
 			continue;
-		pmu_write_counter(event, (u32)local64_read(&event->hw.prev_count));
+		pmu_write_counter(cci_pmu, (u32)local64_read(&event->hw.prev_count), i);
 	}
 }
 
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 00/12] arm-cci: PMU driver updates "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 03/12] arm-cci: Refactor CCI PMU enable/disable methods "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 11/12] arm-cci500: Rearrange PMU driver for code sharing with CCI-550 PMU "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 05/12] arm-cci: write_counter: Remove redundant check "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 01/12] arm-cci: simplify sysfs attr handling "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 06/12] arm-cci: Get the status of a counter "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 07/12] arm-cci: Add routines to save/restore all counters "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100
  [PATCH v6 10/12] arm-cci: CCI-500: Work around PMU counter writes "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2016-01-25 12:30 +0100

csiph-web