[PATCH -next] watchdog/wm831x: fix build when COMPILE_TEST is enabled

[PATCH -next] watchdog/wm831x: fix build when COMPILE_TEST is enabled

[Randy Dunlap]

From: Randy Dunlap <rdunlap@infradead.org>

Fix kconfig dependencies when COMPILE_TEST is enabled so that
interdependent module dependencies are configured as needed.

Fixes build when WM831X_WATCHDOG=m and COMPILE_TEST=y.
No other WM831X drivers are enabled.
The problem is in mixing tristate and boolean dependencies.

ERROR: "wm831x_reg_write" [drivers/watchdog/wm831x_wdt.ko] undefined!
ERROR: "wm831x_reg_read" [drivers/watchdog/wm831x_wdt.ko] undefined!
ERROR: "wm831x_reg_unlock" [drivers/watchdog/wm831x_wdt.ko] undefined!
ERROR: "wm831x_reg_lock" [drivers/watchdog/wm831x_wdt.ko] undefined!
ERROR: "wm831x_set_bits" [drivers/watchdog/wm831x_wdt.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc:	patches@opensource.wolfsonmicro.com
Cc:	Mark Brown <broonie@kernel.org>
---
 drivers/watchdog/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20170228.orig/drivers/watchdog/Kconfig
+++ linux-next-20170228/drivers/watchdog/Kconfig
@@ -176,7 +176,7 @@ config WDAT_WDT
 
 config WM831X_WATCHDOG
 	tristate "WM831x watchdog"
-	depends on MFD_WM831X || COMPILE_TEST
+	depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
 	select WATCHDOG_CORE
 	help
 	  Support for the watchdog in the WM831x AudioPlus PMICs.  When

Re: [PATCH -next] watchdog/wm831x: fix build when COMPILE_TEST is enabled

[Guenter Roeck]

On Tue, Feb 28, 2017 at 10:31:15AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix kconfig dependencies when COMPILE_TEST is enabled so that
> interdependent module dependencies are configured as needed.
> 
> Fixes build when WM831X_WATCHDOG=m and COMPILE_TEST=y.
> No other WM831X drivers are enabled.
> The problem is in mixing tristate and boolean dependencies.
> 
> ERROR: "wm831x_reg_write" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_read" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_unlock" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_lock" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_set_bits" [drivers/watchdog/wm831x_wdt.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc:	patches@opensource.wolfsonmicro.com
> Cc:	Mark Brown <broonie@kernel.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-next-20170228.orig/drivers/watchdog/Kconfig
> +++ linux-next-20170228/drivers/watchdog/Kconfig
> @@ -176,7 +176,7 @@ config WDAT_WDT
>  
>  config WM831X_WATCHDOG
>  	tristate "WM831x watchdog"
> -	depends on MFD_WM831X || COMPILE_TEST
> +	depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
>  	select WATCHDOG_CORE
>  	help
>  	  Support for the watchdog in the WM831x AudioPlus PMICs.  When

Re: [PATCH -next] watchdog/wm831x: fix build when COMPILE_TEST is enabled

[Charles Keepax]

On Tue, Feb 28, 2017 at 10:31:15AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix kconfig dependencies when COMPILE_TEST is enabled so that
> interdependent module dependencies are configured as needed.
> 
> Fixes build when WM831X_WATCHDOG=m and COMPILE_TEST=y.
> No other WM831X drivers are enabled.
> The problem is in mixing tristate and boolean dependencies.
> 
> ERROR: "wm831x_reg_write" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_read" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_unlock" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_reg_lock" [drivers/watchdog/wm831x_wdt.ko] undefined!
> ERROR: "wm831x_set_bits" [drivers/watchdog/wm831x_wdt.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc:	patches@opensource.wolfsonmicro.com
> Cc:	Mark Brown <broonie@kernel.org>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>

Thanks,
Charles