diff mbox series

[1/3] watchdog: remove stale ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS from wdt.h

Message ID 20200313160458.19727-2-rasmus.villemoes@prevas.dk
State Accepted
Commit 21a0bf7f466b8e71ce5ba2c2bcf635d7ab1fc83d
Delegated to: Stefan Roese
Headers show
Series watchdog: honour hw_margin_ms property | expand

Commit Message

Rasmus Villemoes March 13, 2020, 4:04 p.m. UTC 
Since WATCHDOG_TIMEOUT_MSECS was converted to Kconfig (commit
ca51ef7c0c), CONFIG_WATCHDOG_TIMEOUT_MSECS has been guaranteed to be
defined. So remove the dead fallback ifdeffery.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 include/wdt.h | 3 ---
 1 file changed, 3 deletions(-)

Comments

Stefan Roese March 14, 2020, 11:55 a.m. UTC | #1 
On 13.03.20 17:04, Rasmus Villemoes wrote:
> Since WATCHDOG_TIMEOUT_MSECS was converted to Kconfig (commit
> ca51ef7c0c), CONFIG_WATCHDOG_TIMEOUT_MSECS has been guaranteed to be
> defined. So remove the dead fallback ifdeffery.
> 
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
> ---
>   include/wdt.h | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/include/wdt.h b/include/wdt.h
> index 5bcff24ab3..e833d3a772 100644
> --- a/include/wdt.h
> +++ b/include/wdt.h
> @@ -107,9 +107,6 @@ struct wdt_ops {
>   };
>   
>   #if CONFIG_IS_ENABLED(WDT)
> -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
> -#define CONFIG_WATCHDOG_TIMEOUT_MSECS	(60 * 1000)
> -#endif
>   #define WATCHDOG_TIMEOUT_SECS	(CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000)
>   
>   static inline int initr_watchdog(void)
> 

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
diff mbox series

Patch

diff --git a/include/wdt.h b/include/wdt.h
index 5bcff24ab3..e833d3a772 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -107,9 +107,6 @@  struct wdt_ops {
 };
 
 #if CONFIG_IS_ENABLED(WDT)
-#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS	(60 * 1000)
-#endif
 #define WATCHDOG_TIMEOUT_SECS	(CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000)
 
 static inline int initr_watchdog(void)