All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Cc: trini@konsulko.com, sjg@chromium.org, rasmus.villemoes@prevas.dk
Subject: [RFC PATCH 6/8] watchdog: Remove WATCHDOG_RESET macro
Date: Mon, 29 Aug 2022 08:23:11 +0200	[thread overview]
Message-ID: <20220829062313.32654-7-sr@denx.de> (raw)
In-Reply-To: <20220829062313.32654-1-sr@denx.de>

Now that we've globally replaced all WATCHDOG_RESET occurances, let's
remove the ugly macro itself in the header.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 include/watchdog.h | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/include/watchdog.h b/include/watchdog.h
index 1365b154a295..91506d3327a8 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -34,42 +34,6 @@ int init_func_watchdog_reset(void);
 #  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
 #endif
 
-/*
- * Hardware watchdog
- */
-#ifdef CONFIG_HW_WATCHDOG
-	extern void hw_watchdog_reset(void);
-
-	#define WATCHDOG_RESET hw_watchdog_reset
-#else
-	/*
-	 * Maybe a software watchdog?
-	 */
-	#if defined(CONFIG_WATCHDOG)
-		/* Don't require the watchdog to be enabled in SPL */
-		#if defined(CONFIG_SPL_BUILD) &&		\
-			!defined(CONFIG_SPL_WATCHDOG)
-			#define WATCHDOG_RESET() { \
-				cyclic_run(); \
-			}
-		#else
-			extern void watchdog_reset(void);
-
-			#define WATCHDOG_RESET() { \
-				watchdog_reset(); \
-				cyclic_run(); \
-			}
-		#endif
-	#else
-		/*
-		 * No hardware or software watchdog.
-		 */
-		#define WATCHDOG_RESET() { \
-			cyclic_run(); \
-			}
-	#endif /* CONFIG_WATCHDOG */
-#endif /* CONFIG_HW_WATCHDOG */
-
 /*
  * Prototypes from $(CPU)/cpu.c.
  */
-- 
2.37.2


  parent reply	other threads:[~2022-08-29  6:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-29  6:23 [RFC PATCH 0/8] Migrate watchdog reset to cyclic infrastructure Stefan Roese
2022-08-29  6:23 ` [RFC PATCH 1/8] cmd/cyclic: Use div64 macros for division and remainder Stefan Roese
2022-08-30  2:31   ` Simon Glass
2022-08-29  6:23 ` [RFC PATCH 2/8] watchdog: Integrate watchdog triggering into the cyclic framework Stefan Roese
2022-08-29  7:38   ` Rasmus Villemoes
2022-08-29  8:09     ` Stefan Roese
2022-08-29  6:23 ` [RFC PATCH 3/8] cyclic: Introduce schedule() function Stefan Roese
2022-08-30  2:31   ` Simon Glass
2022-08-29  6:23 ` [RFC PATCH 4/8] cyclic: Use schedule() instead of WATCHDOG_RESET() Stefan Roese
2022-08-30  2:31   ` Simon Glass
2022-08-29  6:23 ` [RFC PATCH 5/8] watchdog: Get rid of ASSEMBLY hacks Stefan Roese
2022-08-29  7:50   ` Rasmus Villemoes
2022-08-29  8:31     ` Stefan Roese
2022-08-29  6:23 ` Stefan Roese [this message]
2022-08-30  2:31   ` [RFC PATCH 6/8] watchdog: Remove WATCHDOG_RESET macro Simon Glass
2022-08-29  6:23 ` [RFC PATCH 7/8] watchdog: Further cleanup Stefan Roese
2022-08-30  2:31   ` Simon Glass
2022-08-29  6:23 ` [RFC PATCH 8/8] WIP: .azure-pipelines.yml: Remove evb-ast2600 Stefan Roese
2022-09-02  4:09   ` Joel Stanley
2022-09-02  6:00     ` Joel Stanley
2022-09-02  6:14       ` Stefan Roese
2022-09-02  7:44         ` Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220829062313.32654-7-sr@denx.de \
    --to=sr@denx.de \
    --cc=rasmus.villemoes@prevas.dk \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.