Re: [PATCH] regulator: Fix build breakage on !REGULATOR

[Krzysztof Kozlowski <k.kozlowski@samsung.com>]

On śro, 2015-02-04 at 11:45 +0100, Krzysztof Kozlowski wrote:
> Add missing stubs for regulator_suspend_prepare() and
> regulator_suspend_finish() to fix exynos_defconfig build without
> REGULATOR:
> 
> arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_finish':
> arch/arm/mach-exynos/suspend.c:537: undefined reference to `regulator_suspend_finish'
> arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_prepare':
> arch/arm/mach-exynos/suspend.c:520: undefined reference to `regulator_suspend_prepare'
> make: *** [vmlinux] Error 1
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Reported-by: Joerg Roedel <joro@8bytes.org>
> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>

Heh, git send-email does not CC to reported-by people so +CC Joerg
Roedel for credits for:

https://lkml.org/lkml/2015/1/26/790


> ---
>  include/linux/regulator/machine.h | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
> index 0b08d05d470b..b07562e082c4 100644
> --- a/include/linux/regulator/machine.h
> +++ b/include/linux/regulator/machine.h
> @@ -191,15 +191,22 @@ struct regulator_init_data {
>  	void *driver_data;	/* core does not touch this */
>  };
>  
> -int regulator_suspend_prepare(suspend_state_t state);
> -int regulator_suspend_finish(void);
> -
>  #ifdef CONFIG_REGULATOR
>  void regulator_has_full_constraints(void);
> +int regulator_suspend_prepare(suspend_state_t state);
> +int regulator_suspend_finish(void);
>  #else
>  static inline void regulator_has_full_constraints(void)
>  {
>  }
> +static inline int regulator_suspend_prepare(suspend_state_t state)
> +{
> +	return 0;
> +}
> +static inline int regulator_suspend_finish(void)
> +{
> +	return 0;
> +}
>  #endif
>  
>  #endif