s390/cpum_sf: Rename macro to consistent prefix

Rename macro SAMPLE_FREQ_MODE to SAMPL_FREQ_MODE to make its
prefix consistent with all other macro starting with prefix
SAMPL_XXX.
No functional change.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
index 05be93b5905d13755e7c0ac16a3413789e6d7ffc..547e26a33f67a33eb9dca9f112efc7fb54d9682f 100644 (file)
--- a/arch/s390/include/asm/perf_event.h
+++ b/arch/s390/include/asm/perf_event.h
@@ -66,7 +66,7 @@ struct perf_sf_sde_regs {
 #define SAMPL_RATE(hwc)                ((hwc)->event_base)
 #define SAMPL_FLAGS(hwc)       ((hwc)->config_base)
 #define SAMPL_DIAG_MODE(hwc)   (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_DIAG_MODE)
-#define SAMPLE_FREQ_MODE(hwc)  (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)
+#define SAMPL_FREQ_MODE(hwc)   (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)
 
 #define perf_arch_fetch_caller_regs(regs, __ip) do {                   \
        (regs)->psw.addr = (__ip);                                      \

diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index 1019fee3e734aa28891099e52a0c034af84b7bbd..ca04a56e1520522c8473d983e62795f23bdeb82d 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -798,7 +798,7 @@ static int __hw_perf_event_init_rate(struct perf_event *event,
        hw_init_period(hwc, SAMPL_RATE(hwc));
        debug_sprintf_event(sfdbg, 4, "%s: cpu %d period %#llx freq %d,%#lx\n",
                            __func__, event->cpu, event->attr.sample_period,
-                           event->attr.freq, SAMPLE_FREQ_MODE(hwc));
+                           event->attr.freq, SAMPL_FREQ_MODE(hwc));
        return 0;
 }
 
@@ -1865,7 +1865,7 @@ static int cpumsf_pmu_check_period(struct perf_event *event, u64 value)
                si = cpuhw->qsi;
        }
 
-       do_freq = !!SAMPLE_FREQ_MODE(&event->hw);
+       do_freq = !!SAMPL_FREQ_MODE(&event->hw);
        rate = getrate(do_freq, value, &si);
        if (!rate)
                return -EINVAL;