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

Commit c8bc2b11 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

arm-cci: write_counter: Remove redundant check 



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: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent c66eea5f

drivers/bus/arm-cci.c

+3 −10
Original line number Diff line number Diff line
@@ -814,15 +814,8 @@ 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);

}
@@ -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, local64_read(&event->hw.prev_count));

		pmu_write_counter(cci_pmu, local64_read(&event->hw.prev_count), i);

	}

}