clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names

The '_tval' name in the erratum handling function names doesn't
make much sense anymore (and they were using CVAL the first place).

Drop the _tval tag.

Reviewed-by: Oliver Upton <oupton@google.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211017124225.3018098-6-maz@kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 3221654..8afe8c8 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -369,7 +369,7 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);
 
 static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0);
 
-static void erratum_set_next_event_tval_generic(const int access, unsigned long evt,
+static void erratum_set_next_event_generic(const int access, unsigned long evt,
                                                struct clock_event_device *clk)
 {
        unsigned long ctrl;
@@ -390,17 +390,17 @@ static void erratum_set_next_event_tval_generic(const int access, unsigned long
        arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);
 }
 
-static __maybe_unused int erratum_set_next_event_tval_virt(unsigned long evt,
+static __maybe_unused int erratum_set_next_event_virt(unsigned long evt,
                                            struct clock_event_device *clk)
 {
-       erratum_set_next_event_tval_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk);
+       erratum_set_next_event_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk);
        return 0;
 }
 
-static __maybe_unused int erratum_set_next_event_tval_phys(unsigned long evt,
+static __maybe_unused int erratum_set_next_event_phys(unsigned long evt,
                                            struct clock_event_device *clk)
 {
-       erratum_set_next_event_tval_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk);
+       erratum_set_next_event_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk);
        return 0;
 }
 
@@ -412,8 +412,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
                .desc = "Freescale erratum a005858",
                .read_cntpct_el0 = fsl_a008585_read_cntpct_el0,
                .read_cntvct_el0 = fsl_a008585_read_cntvct_el0,
-               .set_next_event_phys = erratum_set_next_event_tval_phys,
-               .set_next_event_virt = erratum_set_next_event_tval_virt,
+               .set_next_event_phys = erratum_set_next_event_phys,
+               .set_next_event_virt = erratum_set_next_event_virt,
        },
 #endif
 #ifdef CONFIG_HISILICON_ERRATUM_161010101
@@ -423,8 +423,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
                .desc = "HiSilicon erratum 161010101",
                .read_cntpct_el0 = hisi_161010101_read_cntpct_el0,
                .read_cntvct_el0 = hisi_161010101_read_cntvct_el0,
-               .set_next_event_phys = erratum_set_next_event_tval_phys,
-               .set_next_event_virt = erratum_set_next_event_tval_virt,
+               .set_next_event_phys = erratum_set_next_event_phys,
+               .set_next_event_virt = erratum_set_next_event_virt,
        },
        {
                .match_type = ate_match_acpi_oem_info,
@@ -432,8 +432,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
                .desc = "HiSilicon erratum 161010101",
                .read_cntpct_el0 = hisi_161010101_read_cntpct_el0,
                .read_cntvct_el0 = hisi_161010101_read_cntvct_el0,
-               .set_next_event_phys = erratum_set_next_event_tval_phys,
-               .set_next_event_virt = erratum_set_next_event_tval_virt,
+               .set_next_event_phys = erratum_set_next_event_phys,
+               .set_next_event_virt = erratum_set_next_event_virt,
        },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_858921
@@ -452,8 +452,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
                .desc = "Allwinner erratum UNKNOWN1",
                .read_cntpct_el0 = sun50i_a64_read_cntpct_el0,
                .read_cntvct_el0 = sun50i_a64_read_cntvct_el0,
-               .set_next_event_phys = erratum_set_next_event_tval_phys,
-               .set_next_event_virt = erratum_set_next_event_tval_virt,
+               .set_next_event_phys = erratum_set_next_event_phys,
+               .set_next_event_virt = erratum_set_next_event_virt,
        },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_1418040