Hi Stephen, On Fri, Feb 05, 2016 at 10:14:12AM +1100, Stephen Rothwell wrote: > Hi Maxime, > > After merging the sunxi tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/clk/sunxi/clk-sunxi.c: In function 'sunxi_mux_clk_setup': > drivers/clk/sunxi/clk-sunxi.c:712:2: warning: 'return' with no value, in function returning non-void [-Wreturn-type] > return; > ^ > drivers/clk/sunxi/clk-sunxi.c:718:20: error: invalid storage class for function 'sun4i_cpu_clk_setup' > static void __init sun4i_cpu_clk_setup(struct device_node *node) > ^ > drivers/clk/sunxi/clk-sunxi.c:718:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] > static void __init sun4i_cpu_clk_setup(struct device_node *node) > ^ > In file included from include/linux/clk-provider.h:15:0, > from drivers/clk/sunxi/clk-sunxi.c:18: > include/linux/of.h:937:16: error: initializer element is not constant > .data = (fn == (fn_type)NULL) ? fn : fn } > ^ > include/linux/of.h:950:3: note: in expansion of macro '_OF_DECLARE' > _OF_DECLARE(table, name, compat, fn, of_init_fn_1) > ^ > > and on and on ... > > Caused by commit > > 1190461d5ad8 ("clk: sunxi: Remove clk_register_clkdev calls") > > I have used the sunxi tree from next-20160204 for today. It was a flacky merge on my side, sorry for that. It's fixed and pushed, hopefully it won't break in the next version. Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Attachment:
signature.asc
Description: Digital signature