clocksource: cosmetic: Drop OF 'dependency' from symbols

Seeing the 'of' characters in a symbol that is being called from
ACPI seems to freak out people. So let's do a bit of pointless
renaming so that these folks do feel at home.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index a66e37e211a9a8cbfabf85d9213f6b73db417085..97b22fa7cb3a62d5d6fd4a36935d4a32715fe6cf 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_of_init();
+               clocksource_probe();
        }
 }

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index a55655127ef23e7b3a325fdd43c4d9ff729719fd..bef41837bf7fd7090eccf768c2881662ac42025a 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -647,7 +647,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
 void __init omap4_local_timer_init(void)
 {
        omap4_sync32k_timer_init();
-       clocksource_of_init();
+       clocksource_probe();
 }
 #else
 void __init omap4_local_timer_init(void)
@@ -663,7 +663,7 @@ void __init omap5_realtime_timer_init(void)
        omap4_sync32k_timer_init();
        realtime_counter_init();
 
-       clocksource_of_init();
+       clocksource_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 b6cf3b449428960d28590f5cdad6e331d2239080..251c7b9c5f9b6c15ffdab39475d6b7764e9c2fc0 100644 (file)
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -67,7 +67,7 @@ static void __init rockchip_timer_init(void)
        }
 
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 }
 
 static void __init rockchip_dt_init(void)

diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 6bfa6407a27c0baed01a04c17f223b0e6087c5cf..1e572a903f8e470e8864738be0464b3a48b63940 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -97,7 +97,7 @@ static u32 __init r8a7779_read_mode_pins(void)
 static void __init r8a7779_init_time(void)
 {
        r8a7779_clocks_init(r8a7779_read_mode_pins());
-       clocksource_of_init();
+       clocksource_probe();
 }
 
 static const char *const r8a7779_compat_dt[] __initconst = {

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index aa3339258d9c0232a4092a01e9abf2b3243098f6..9eccde3c7b137151e3fcff5c882cb6bd62870195 100644 (file)
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -128,7 +128,7 @@ void __init rcar_gen2_timer_init(void)
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
        rcar_gen2_clocks_init(mode);
-       clocksource_of_init();
+       clocksource_probe();
 }
 
 struct memory_reserve_config {

diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index b7afce6795f436e9259e84d34f01fa246173eedf..ca2f6a82a4141e7d448779901e2fc1a151d118b8 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_of_init();
+       clocksource_probe();
 }

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 65bab2876343aff24707105f0432c90faaf90e60..223c9e99380d89fa7658a46ba67534d9c3c47776 100644 (file)
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -46,7 +46,7 @@ static void __init sun6i_timer_init(void)
        of_clk_init(NULL);
        if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
                sun6i_reset_init();
-       clocksource_of_init();
+       clocksource_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 35670b15f28182299a94373cfd8fdae54c2f7e2f..546338bbacf8670b30b483c1c69737bc5813a723 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -408,7 +408,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_of_init,
+       .init_time      = clocksource_probe,
        .init_machine   = u300_init_machine_dt,
        .restart        = u300_restart,
        .dt_compat      = u300_board_compat,

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index ff28d8ad1ed7347dec1928ca0d2bb1ac118d7c47..8d2d233f8e6cfaa248801c69033b511d7adef5af 100644 (file)
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -44,5 +44,5 @@ void __init ux500_timer_init(void)
 
 dt_fail:
        clksrc_dbx500_prcmu_init(prcmu_timer_base);
-       clocksource_of_init();
+       clocksource_probe();
 }

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5a6e4e20ca0a98ae07d39d6b764d2f799fc1448d..6f39d03cc27eac777a243abcb5a08ea4c35e8d7c 100644 (file)
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -154,7 +154,7 @@ static void __init zynq_timer_init(void)
 
        zynq_clock_init();
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_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 819a105d3085fdcfac170ade454cec58bf55301f..13339b6ffc1a07839103fca328f1eccd6d185c12 100644 (file)
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -67,7 +67,7 @@ void __init time_init(void)
        u32 arch_timer_rate;
 
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 
        tick_setup_hrtimer_broadcast();
 

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index ab5b488e1fde666bc24b3dd3d78f6f4950829282..89a2a93949274b16b3508b314d0cbdf6db5946e6 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -194,7 +194,7 @@ void __init time_init(void)
 {
        of_clk_init(NULL);
        setup_cpuinfo_clk();
-       clocksource_of_init();
+       clocksource_probe();
 }
 
 #ifdef CONFIG_DEBUG_FS

diff --git a/arch/mips/pistachio/time.c b/arch/mips/pistachio/time.c
index 8a377346f0cabbf5ce91199ca039ec013b16dda1..1022201b2bebddf5453cda975ab6820bd432e41c 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_of_init();
+       clocksource_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 feb5a9bf98b4bc316a8e568635613e02fd262b68..25c4a61779f1f3a015b9eb7d76bdfc63e3a7dab4 100644 (file)
--- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c
@@ -75,5 +75,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_of_init();
+       clocksource_probe();
 }

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

diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index b97767dbc7c8e71d15d5d845f2388508ffc5b0ed..b9ad9feadc2d1a01da539d69fa735ebb61f607f2 100644 (file)
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -148,7 +148,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_of_init();
+       clocksource_probe();
 }
 
 /*

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index b47be92cd7efd9300d747660ad7f282e8cbf6bd6..51856d50bccc33ac49793e7eff9bffc25ef19e80 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_CLKSRC_PROBE)     += clksrc-of.o
+obj-$(CONFIG_CLKSRC_PROBE)     += clksrc-probe.o
 obj-$(CONFIG_ATMEL_PIT)                += timer-atmel-pit.o
 obj-$(CONFIG_ATMEL_ST)         += timer-atmel-st.o
 obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o

diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
deleted file mode 100644 (file)
index a2105bd..0000000
--- a/drivers/clocksource/clksrc-of.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/acpi.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/clocksource.h>
-
-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_of_init(void)
-{
-       struct device_node *np;
-       const struct of_device_id *match;
-       of_init_fn_1 init_func;
-       unsigned clocksources = 0;
-
-       for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
-               if (!of_device_is_available(np))
-                       continue;
-
-               init_func = match->data;
-               init_func(np);
-               clocksources++;
-       }
-
-       clocksources += acpi_probe_device_table(clksrc);
-
-       if (!clocksources)
-               pr_crit("%s: no matching clocksources found\n", __func__);
-}

diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c
new file mode 100644 (file)
index 0000000..7cb6c92
--- /dev/null
+++ b/drivers/clocksource/clksrc-probe.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/clocksource.h>
+
+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)
+{
+       struct device_node *np;
+       const struct of_device_id *match;
+       of_init_fn_1 init_func;
+       unsigned clocksources = 0;
+
+       for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
+               if (!of_device_is_available(np))
+                       continue;
+
+               init_func = match->data;
+               init_func(np);
+               clocksources++;
+       }
+
+       clocksources += acpi_probe_device_table(clksrc);
+
+       if (!clocksources)
+               pr_crit("%s: no matching clocksources found\n", __func__);
+}

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 116645f746c173ab57eeab1f058404bcfb773d23..7784b597e9592b0ea0a32d661a0068cf9a8e2137 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -247,9 +247,9 @@ extern int clocksource_i8253_init(void);
        OF_DECLARE_1(clksrc, name, compat, fn)
 
 #ifdef CONFIG_CLKSRC_PROBE
-extern void clocksource_of_init(void);
+extern void clocksource_probe(void);
 #else
-static inline void clocksource_of_init(void) {}
+static inline void clocksource_probe(void) {}
 #endif
 
 #define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn)           \