ARM: perf: remove unnecessary checks for idx < 0
authorMark Rutland <Mark.Rutland@arm.com>
Fri, 18 Jan 2013 13:42:59 +0000 (13:42 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 18 Jan 2013 13:46:09 +0000 (13:46 +0000)
commit8f3b90b585d3e879b03ce2a202da04d59dd5b699
treed592d08d124d1c441d5c6ee66a0adc353f9cb50b
parent76b8a0e4c8bda5f03574b8a904331266d162c796
ARM: perf: remove unnecessary checks for idx < 0

We currently check for hwx->idx < 0 in armpmu_read and armpmu_del
unnecessarily. The only case where hwc->idx < 0 is when armpmu_add
fails, in which case the event's state is set to
PERF_EVENT_STATE_INACTIVE.

The perf core will not attempt to read from an event in
PERF_EVENT_STATE_INACTIVE, and so the check in armpmu_read is
unnecessary. Similarly, if perf core cannot add an event it will not
attempt to delete it, so the WARN_ON in armpmu_del is unnecessary.

This patch removes these two redundant checks.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm/kernel/perf_event.c