linux-next: build failure after merge of the net-next tree

[Stephen Rothwell]

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/ethernet/ti/cpts.c: In function 'cpts_of_mux_clk_setup':
drivers/net/ethernet/ti/cpts.c:567:2: error: implicit declaration of function 'of_clk_parent_fill'; did you mean 'of_clk_get_parent_name'? [-Werror=implicit-function-declaration]
  of_clk_parent_fill(refclk_np, parent_names, num_parents);
  ^~~~~~~~~~~~~~~~~~
  of_clk_get_parent_name
drivers/net/ethernet/ti/cpts.c:575:11: error: implicit declaration of function 'clk_hw_register_mux_table'; did you mean 'clk_hw_register_clkdev'? [-Werror=implicit-function-declaration]
  clk_hw = clk_hw_register_mux_table(cpts->dev, refclk_np->name,
           ^~~~~~~~~~~~~~~~~~~~~~~~~
           clk_hw_register_clkdev
drivers/net/ethernet/ti/cpts.c:575:9: warning: assignment to 'struct clk_hw *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
  clk_hw = clk_hw_register_mux_table(cpts->dev, refclk_np->name,
         ^
drivers/net/ethernet/ti/cpts.c:586:29: error: 'clk_hw_unregister_mux' undeclared (first use in this function); did you mean 'clk_hw_register_clkdev'?
            (void(*)(void *))clk_hw_unregister_mux,
                             ^~~~~~~~~~~~~~~~~~~~~
                             clk_hw_register_clkdev
drivers/net/ethernet/ti/cpts.c:586:29: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/ethernet/ti/cpts.c:593:8: error: implicit declaration of function 'of_clk_add_hw_provider'; did you mean 'of_clk_get_from_provider'? [-Werror=implicit-function-declaration]
  ret = of_clk_add_hw_provider(refclk_np, of_clk_hw_simple_get, clk_hw);
        ^~~~~~~~~~~~~~~~~~~~~~
        of_clk_get_from_provider
drivers/net/ethernet/ti/cpts.c:593:42: error: 'of_clk_hw_simple_get' undeclared (first use in this function); did you mean 'ida_simple_get'?
  ret = of_clk_add_hw_provider(refclk_np, of_clk_hw_simple_get, clk_hw);
                                          ^~~~~~~~~~~~~~~~~~~~
                                          ida_simple_get
drivers/net/ethernet/ti/cpts.c:598:29: error: 'of_clk_del_provider' undeclared (first use in this function); did you mean 'of_clk_get_from_provider'?
            (void(*)(void *))of_clk_del_provider,
                             ^~~~~~~~~~~~~~~~~~~
                             of_clk_get_from_provider
cc1: some warnings being treated as errors

Caused by commit

  a3047a81ba13 ("net: ethernet: ti: cpts: add support for ext rftclk selection")

of_clk_parent_fill() and others above are only available if
CONFIG_COMMON_CLK is set (which it is not for this build).

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpb0KTf9e79_.pgp
Description: OpenPGP digital signature