leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm-cci: write_counter: Remove redundant check

Browse Source 
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>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Suzuki K Poulose 2016-02-23 10:49:48 +00:00 committed by Will Deacon
parent c66eea5f9f
commit c8bc2b1140
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/bus/arm-cci.c
View File

@ -814,16 +814,9 @@ static u32 pmu_read_counter(struct perf_event *event)
return value; 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); pmu_write_register(cci_pmu, value, idx, CCI_PMU_CNTR);
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);
} }
static void pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask) 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)) if (WARN_ON(!event))
continue; continue;
pmu_write_counter(event, local64_read(&event->hw.prev_count)); pmu_write_counter(cci_pmu, local64_read(&event->hw.prev_count), i);
} }
} }