clocksource/drivers: Rename clocksource_probe to timer_probe

The function name is now renamed to 'timer_probe' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index fc8211f338ad33cab4036a09693cb77e1ea62a98..666613fde91d09cb48f76370dc5b9ff0bd91feae 100644 (file)
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -470,7 +470,7 @@ void __init setup_arch(char **cmdline_p)
 void __init time_init(void)
 {
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }
 
 static int __init customize_machine(void)

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 97b22fa7cb3a62d5d6fd4a36935d4a32715fe6cf..629f8e9981f1ee775afa792d5cd86ddbded76493 100644 (file)
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -120,6 +120,6 @@ void __init time_init(void)
 #ifdef CONFIG_COMMON_CLK
                of_clk_init(NULL);
 #endif
-               clocksource_probe();
+               timer_probe();
        }
 }

diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c
index a6e3c98b95ed436c7470f1ae58d17ba9bec446f5..c3cf215773b2de6228abbd27cc89ca234512f7f8 100644 (file)
--- a/arch/arm/mach-mediatek/mediatek.c
+++ b/arch/arm/mach-mediatek/mediatek.c
@@ -41,7 +41,7 @@ static void __init mediatek_timer_init(void)
        }
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 };
 
 static const char * const mediatek_board_dt_compat[] = {

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 07dd692c47372f8aa145d00cb5532b75774429c5..ae4bb9fdc483118cbe073177f8d111192bfa19bb 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -497,7 +497,7 @@ void __init omap_init_time(void)
        __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
                        2, "timer_sys_ck", NULL, false);
 
-       clocksource_probe();
+       timer_probe();
 }
 
 #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
@@ -506,7 +506,7 @@ void __init omap3_secure_sync32k_timer_init(void)
        __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
                        2, "timer_sys_ck", NULL, false);
 
-       clocksource_probe();
+       timer_probe();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 
@@ -517,7 +517,7 @@ void __init omap3_gptimer_timer_init(void)
        __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
                        1, "timer_sys_ck", "ti,timer-alwon", true);
        if (of_have_populated_dt())
-               clocksource_probe();
+               timer_probe();
 }
 #endif
 
@@ -532,7 +532,7 @@ static void __init omap4_sync32k_timer_init(void)
 void __init omap4_local_timer_init(void)
 {
        omap4_sync32k_timer_init();
-       clocksource_probe();
+       timer_probe();
 }
 #endif
 
@@ -656,7 +656,7 @@ void __init omap5_realtime_timer_init(void)
        omap4_sync32k_timer_init();
        realtime_counter_init();
 
-       clocksource_probe();
+       timer_probe();
 }
 #endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
 

diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index ef0500a4c8ad75e89a42bf7a06ee9736272d27dc..5ab834ebcb492221d237403ddde18c73183ed2f7 100644 (file)
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -55,7 +55,7 @@ static void __init rockchip_timer_init(void)
        }
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }
 
 static void __init rockchip_dt_init(void)

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 52d466b759730d745fee2c18533dcd60b5093b77..a6e74f481dea2005dd0cfaf975e3a00095228c80 100644 (file)
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -113,7 +113,7 @@ void __init rcar_gen2_timer_init(void)
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }
 
 struct memory_reserve_config {

diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index ca2f6a82a4141e7d448779901e2fc1a151d118b8..31c43cabf362399a9af40abdaf75e50b12f0f8f9 100644 (file)
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -124,5 +124,5 @@ void __init spear13xx_timer_init(void)
        clk_put(pclk);
 
        spear_setup_of_timer();
-       clocksource_probe();
+       timer_probe();
 }

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index f44e3acb5c90e8b0b845908038b9ac6473fc6824..7ab353fb25f292be31b36cc4fe9fd872e7ad4964 100644 (file)
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -42,7 +42,7 @@ static void __init sun6i_timer_init(void)
        of_clk_init(NULL);
        if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
                sun6i_reset_init();
-       clocksource_probe();
+       timer_probe();
 }
 
 DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index a4910ea6811a4538afef32f9192069b77a7164a9..048f15e8c6699353583f64fc2093b3c3a0e44ea9 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -407,7 +407,7 @@ static const char * u300_board_compat[] = {
 DT_MACHINE_START(U300_DT, "U300 S335/B335 (Device Tree)")
        .map_io         = u300_map_io,
        .init_irq       = u300_init_irq_dt,
-       .init_time      = clocksource_probe,
+       .init_time      = timer_probe,
        .init_machine   = u300_init_machine_dt,
        .restart        = u300_restart,
        .dt_compat      = u300_board_compat,

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index ed118648313f63df2c58a77199491a168d4783a3..6aba9ebf80411d7f595ebce446c83856189d7283 100644 (file)
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -150,7 +150,7 @@ static void __init zynq_timer_init(void)
 {
        zynq_clock_init();
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }
 
 static struct map_desc zynq_cortex_a9_scu_map __initdata = {

diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 59779699a1a40ef3a1940aa0d878c16164ea5398..da33c90248e98eaf1e14a6a0e0061ccddad21420 100644 (file)
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -70,7 +70,7 @@ void __init time_init(void)
        u32 arch_timer_rate;
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 
        tick_setup_hrtimer_broadcast();
 

diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index c8c25a4e9e489eb8944d87551f55694dc6e50b8a..6be15d6346505394988ca75841ac3da1196435f2 100644 (file)
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -246,5 +246,5 @@ void __init calibrate_delay(void)
 void __init time_init(void)
 {
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index f31ebb5dc26c21922f240545d038f0d6b5699300..be98ffe28ca88f7af3966f67d6798c2ebbfdad50 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -192,7 +192,7 @@ void __init time_init(void)
 {
        of_clk_init(NULL);
        setup_cpuinfo_clk();
-       clocksource_probe();
+       timer_probe();
 }
 
 #ifdef CONFIG_DEBUG_FS

diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
index 4af619215410a09946ef82c7c2cb37755423ba59..1231b5a17b37bd8625bbf3ce55806be000991a7e 100644 (file)
--- a/arch/mips/generic/init.c
+++ b/arch/mips/generic/init.c
@@ -161,7 +161,7 @@ void __init plat_time_init(void)
                }
        }
 
-       clocksource_probe();
+       timer_probe();
 }
 
 void __init arch_init_irq(void)

diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 289edcfadd7cd40fe83cca8eceb982ec233d6191..cea4ec9098063ed8c82eb41786fba4634f73a4d2 100644 (file)
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -265,7 +265,7 @@ void __init plat_time_init(void)
                       (freq%1000000)*100/1000000);
 #ifdef CONFIG_CLKSRC_MIPS_GIC
                update_gic_frequency_dt();
-               clocksource_probe();
+               timer_probe();
 #endif
        }
 #endif

diff --git a/arch/mips/pic32/pic32mzda/time.c b/arch/mips/pic32/pic32mzda/time.c
index 62a0a78b6c6446c58cb2ac08bf61157e40c4c6ed..1894e50939b5713fe42a13e912cce1d7eee6326d 100644 (file)
--- a/arch/mips/pic32/pic32mzda/time.c
+++ b/arch/mips/pic32/pic32mzda/time.c
@@ -64,5 +64,5 @@ void __init plat_time_init(void)
        pr_info("CPU Clock: %ldMHz\n", rate / 1000000);
        mips_hpt_frequency = rate / 2;
 
-       clocksource_probe();
+       timer_probe();
 }

diff --git a/arch/mips/pistachio/time.c b/arch/mips/pistachio/time.c
index 1022201b2bebddf5453cda975ab6820bd432e41c..17a0f1dec05bd6bff766f5bbbe446b029deb5b5d 100644 (file)
--- a/arch/mips/pistachio/time.c
+++ b/arch/mips/pistachio/time.c
@@ -39,7 +39,7 @@ void __init plat_time_init(void)
        struct clk *clk;
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 
        np = of_get_cpu_node(0, NULL);
        if (!np) {

diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
index df795885eace90301f8f4a9e85df7659f3c88fd6..eb1c61917eb76baa14b031ead89693f27a1df22d 100644 (file)
--- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c
@@ -82,5 +82,5 @@ void __init plat_time_init(void)
        pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
        mips_hpt_frequency = clk_get_rate(clk) / 2;
        clk_put(clk);
-       clocksource_probe();
+       timer_probe();
 }

diff --git a/arch/mips/ralink/timer-gic.c b/arch/mips/ralink/timer-gic.c
index 069771dbec42a5a12a7d8411485efd9df33c7101..b5f07d21fcf296951eed44ae1a7d7f964fc40b9f 100644 (file)
--- a/arch/mips/ralink/timer-gic.c
+++ b/arch/mips/ralink/timer-gic.c
@@ -20,5 +20,5 @@ void __init plat_time_init(void)
        ralink_of_remap();
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 }

diff --git a/arch/mips/xilfpga/time.c b/arch/mips/xilfpga/time.c
index cbb3fca7b6fa32c1f8e3867e080c0d34ca3f15e8..36f3f1870ee287c49a9e36f17a18c4c7c989e9a7 100644 (file)
--- a/arch/mips/xilfpga/time.c
+++ b/arch/mips/xilfpga/time.c
@@ -22,7 +22,7 @@ void __init plat_time_init(void)
        struct clk *clk;
 
        of_clk_init(NULL);
-       clocksource_probe();
+       timer_probe();
 
        np = of_get_cpu_node(0, NULL);
        if (!np) {

diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c
index 2954b661737802abc43dd9f595c406aa202386a6..645129aaa9a016b5e91b2ebc6e42e241ee00f72d 100644 (file)
--- a/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@ -350,7 +350,7 @@ void __init time_init(void)
        if (count < 2)
                panic("%d timer is found, it needs 2 timers in system\n", count);
 
-       clocksource_probe();
+       timer_probe();
 }
 
 TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);

diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 1fb6d5714bae27dcc8f3cf2f584aa25a1635bd7f..4feb7c86f4acfb56e18561ffdcd24188a5ba4ee8 100644 (file)
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -119,7 +119,7 @@ static void __init sh_of_mem_reserve(void)
 static void __init sh_of_time_init(void)
 {
        pr_info("SH generic board support: scanning for clocksource devices\n");
-       clocksource_probe();
+       timer_probe();
 }
 
 static void __init sh_of_setup(char **cmdline_p)

diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 668c1056f9e49bf8ca23234d16dc44fec9bec9b2..fd524a54d2ab5e8f82e5485c6105f84d1a748b02 100644 (file)
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -187,7 +187,7 @@ void __init time_init(void)
        local_timer_setup(0);
        setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);
        sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);
-       clocksource_probe();
+       timer_probe();
 }
 
 /*

diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c
index ac701ffb8d59c7ab0d3cbc37ba0849d653671c49..5d549c2a65fef813d1d757cda9ebc9ee805749f3 100644 (file)
--- a/drivers/clocksource/clksrc-probe.c
+++ b/drivers/clocksource/clksrc-probe.c
@@ -24,7 +24,7 @@ extern struct of_device_id __clksrc_of_table[];
 static const struct of_device_id __clksrc_of_table_sentinel
        __used __section(__clksrc_of_table_end);
 
-void __init clocksource_probe(void)
+void __init timer_probe(void)
 {
        struct device_node *np;
        const struct of_device_id *match;

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index a86b65f0a2466bbad839db1707fff8d520341e1a..010bb9f60db29ec8ab20bcc5177be4961d8a8ac5 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -253,9 +253,9 @@ extern int clocksource_i8253_init(void);
        OF_DECLARE_1_RET(clksrc, name, compat, fn)
 
 #ifdef CONFIG_CLKSRC_PROBE
-extern void clocksource_probe(void);
+extern void timer_probe(void);
 #else
-static inline void clocksource_probe(void) {}
+static inline void timer_probe(void) {}
 #endif
 
 #define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn)           \