[PATCH 08/20] clk: No-op CLK_OF_DECLARE if not enabled

[Sascha Hauer]

Hi Andrey,

On Wed, Mar 08, 2017 at 02:08:57PM -0800, Andrey Smirnov wrote:
> Instead of wrapping each defenition of CLK_OF_DECLARE hook with
> preprocessor guards, change the definition of CLK_OF_DECLARE to expand
> into no-op if COMMON_CLK_OF_PROVIDER is not enabled.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>
> ---
>  drivers/clk/clk-fixed-factor.c | 2 --
>  drivers/clk/clk-fixed.c        | 3 +--
>  include/linux/clk.h            | 6 +++++-
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
> index a3dbf33..0be4855 100644
> --- a/drivers/clk/clk-fixed-factor.c
> +++ b/drivers/clk/clk-fixed-factor.c
> @@ -93,7 +93,6 @@ struct clk *clk_fixed_factor(const char *name,
>  	return &f->clk;
>  }
>  
> -#if defined(CONFIG_COMMON_CLK_OF_PROVIDER)
>  /**
>   * of_fixed_factor_clk_setup() - Setup function for simple fixed factor clock
>   */
> @@ -127,4 +126,3 @@ static int of_fixed_factor_clk_setup(struct device_node *node)
>  }
>  CLK_OF_DECLARE(fixed_factor_clk, "fixed-factor-clock",
>  		of_fixed_factor_clk_setup);
> -#endif

This causes compile breakage when CONFIG_COMMON_CLK_OF_PROVIDER is disabled:

drivers/clk/clk-fixed.c: In function 'of_fixed_clk_setup':
drivers/clk/clk-fixed.c:75:2: error: implicit declaration of function 'of_clk_add_provider' [-Werror=implicit-function-declaration]
drivers/clk/clk-fixed.c:75:35: error: 'of_clk_src_simple_get' undeclared (first use in this function)
drivers/clk/clk-fixed.c:75:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/clk/clk-fixed.c: At top level:
drivers/clk/clk-fixed.c:61:12: warning: 'of_fixed_clk_setup' defined but not used [-Wunused-function]
cc1: some warnings being treated as errors
ICECC[17949] 11:47:35: Compiled on 10.1.0.23
/ptx/work/dude/WORK_A/sha/backup/barebox/barebox/scripts/Makefile.build:249: recipe for target 'drivers/clk/clk-fixed.o' failed
make[3]: *** [drivers/clk/clk-fixed.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  LD      drivers/pinctrl/built-in.o
  CC      drivers/clk/imx/clk-pllv1.o
  CC      drivers/clk/imx/clk-pllv2.o
  CC      drivers/clk/imx/clk-pllv3.o
  CC      drivers/clk/imx/clk-pfd.o
  CC      drivers/clk/imx/clk-gate2.o
  CC      drivers/clk/imx/clk-gate-exclusive.o
  CC      drivers/clk/imx/clk-cpu.o
  CC      drivers/clk/imx/clk.o
  LD      drivers/watchdog/built-in.o
  CC      drivers/clk/imx/clk-imx25.o
drivers/clk/clk-fixed-factor.c: In function 'of_fixed_factor_clk_setup':
drivers/clk/clk-fixed-factor.c:119:2: error: implicit declaration of function 'of_clk_get_parent_name' [-Werror=implicit-function-declaration]
drivers/clk/clk-fixed-factor.c:119:14: warning: assignment makes pointer from integer without a cast
drivers/clk/clk-fixed-factor.c:125:2: error: implicit declaration of function 'of_clk_add_provider' [-Werror=implicit-function-declaration]
drivers/clk/clk-fixed-factor.c:125:35: error: 'of_clk_src_simple_get' undeclared (first use in this function)
drivers/clk/clk-fixed-factor.c:125:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/clk/clk-fixed-factor.c: At top level:
drivers/clk/clk-fixed-factor.c:99:12: warning: 'of_fixed_factor_clk_setup' defined but not used [-Wunused-function]

I dropped this patch for now.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |