From: 黄涛 Date: Fri, 24 May 2013 10:11:56 +0000 (+0800) Subject: rk: clock: fix compile error when build without PROC_FS support X-Git-Tag: firefly_0821_release~7037 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b2755f61733c027547468bdec1b109f552ec5e53;p=firefly-linux-kernel-4.4.55.git rk: clock: fix compile error when build without PROC_FS support --- diff --git a/arch/arm/plat-rk/clock.c b/arch/arm/plat-rk/clock.c index 4d674327c29a..2b0b6da61ca3 100644 --- a/arch/arm/plat-rk/clock.c +++ b/arch/arm/plat-rk/clock.c @@ -710,12 +710,14 @@ cnu_out: } EXPORT_SYMBOL(clk_notifier_unregister); +#ifdef CONFIG_PROC_FS static struct clk_dump_ops *dump_def_ops; void clk_register_dump_ops(struct clk_dump_ops *ops) { dump_def_ops=ops; } +#endif #ifdef CONFIG_RK_CLOCK_PROC static int proc_clk_show(struct seq_file *s, void *v) diff --git a/arch/arm/plat-rk/include/plat/clock.h b/arch/arm/plat-rk/include/plat/clock.h index 65b23a2879af..bc2f7fae2a12 100644 --- a/arch/arm/plat-rk/include/plat/clock.h +++ b/arch/arm/plat-rk/include/plat/clock.h @@ -98,7 +98,7 @@ struct clk_dump_ops { void clk_register_dump_ops(struct clk_dump_ops *ops); #else -static inline void clk_register_dump_ops(struct clk_dump_ops *ops) {} +#define clk_register_dump_ops(ops) do {} while (0) #endif /**