s390/cpum_sf: Use TEAR_REG macro consistantly

The macro TEAR_REG() saves the last used SDBT address
in the perf_hw_event structure. This is also done
by function hw_reset_registers() which is a one-liner
and simply uses macro TEAR_REG(). Remove function
hw_reset_registers(), which is only used one time and use
macro TEAR_REG() instead. This macro is used throughout
the code anyway.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index dc0ac09..cd9fb45 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -602,13 +602,6 @@ static void hw_init_period(struct hw_perf_event *hwc, u64 period)
        local64_set(&hwc->period_left, hwc->sample_period);
 }
 
-static void hw_reset_registers(struct hw_perf_event *hwc,
-                              unsigned long *sdbt_origin)
-{
-       /* (Re)set to first sample-data-block-table */
-       TEAR_REG(hwc) = (unsigned long) sdbt_origin;
-}
-
 static unsigned long hw_limit_rate(const struct hws_qsi_info_block *si,
                                   unsigned long rate)
 {
@@ -1879,7 +1872,7 @@ static int cpumsf_pmu_add(struct perf_event *event, int flags)
        if (!SAMPL_DIAG_MODE(&event->hw)) {
                cpuhw->lsctl.tear = (unsigned long) cpuhw->sfb.sdbt;
                cpuhw->lsctl.dear = *(unsigned long *) cpuhw->sfb.sdbt;
-               hw_reset_registers(&event->hw, cpuhw->sfb.sdbt);
+               TEAR_REG(&event->hw) = (unsigned long) cpuhw->sfb.sdbt;
        }
 
        /* Ensure sampling functions are in the disabled state.  If disabled,