UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/cpum_cf: make hw_perf_event_update() a void function 

The return code of hw_perf_event_update() is not evaluated by
its callers.  Hence, simplify the function by removing the
return code.

Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2017-02-20 16:10:38 +01:00 committed by Martin Schwidefsky
parent 26f268ac68
commit 485527ba57
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/kernel/perf_cpum_cf.c
View File

@ -462,7 +462,7 @@ static int hw_perf_event_reset(struct perf_event *event)
return err; return err;
} }
static int hw_perf_event_update(struct perf_event *event) static void hw_perf_event_update(struct perf_event *event)
{ {
u64 prev, new, delta; u64 prev, new, delta;
int err; int err;
@ -471,14 +471,12 @@ static int hw_perf_event_update(struct perf_event *event)
prev = local64_read(&event->hw.prev_count); prev = local64_read(&event->hw.prev_count);
err = ecctr(event->hw.config, &new); err = ecctr(event->hw.config, &new);
if (err) if (err)
goto out; return;
} while (local64_cmpxchg(&event->hw.prev_count, prev, new) != prev); } while (local64_cmpxchg(&event->hw.prev_count, prev, new) != prev);
delta = (prev <= new) ? new - prev delta = (prev <= new) ? new - prev
: (-1ULL - prev) + new + 1; /* overflow */ : (-1ULL - prev) + new + 1; /* overflow */
local64_add(delta, &event->count); local64_add(delta, &event->count);
out:
return err;
} }
static void cpumf_pmu_read(struct perf_event *event) static void cpumf_pmu_read(struct perf_event *event)