From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Cc: trini@konsulko.com, sjg@chromium.org, rasmus.villemoes@prevas.dk
Subject: [PATCH v1 5/6] watchdog: Remove WATCHDOG_RESET macro
Date: Fri, 2 Sep 2022 14:10:48 +0200 [thread overview]
Message-ID: <20220902121049.1282136-6-sr@denx.de> (raw)
In-Reply-To: <20220902121049.1282136-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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
v1:
- Add Simon's SoB tag
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.3
next prev parent reply other threads:[~2022-09-02 12:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 12:10 [PATCH v1 0/6] Migrate watchdog reset to cyclic infrastructure Stefan Roese
2022-09-02 12:10 ` [PATCH v1 1/6] watchdog: Integrate watchdog triggering into the cyclic framework Stefan Roese
2022-09-02 19:59 ` Simon Glass
2022-09-02 12:10 ` [PATCH v1 2/6] cyclic: Introduce schedule() function Stefan Roese
2022-09-02 12:10 ` [PATCH v1 3/6] cyclic: Use schedule() instead of WATCHDOG_RESET() Stefan Roese
2022-09-02 12:10 ` [PATCH v1 4/6] watchdog: Get rid of ASSEMBLY hacks Stefan Roese
2022-09-02 12:10 ` Stefan Roese [this message]
2022-09-02 12:10 ` [PATCH v1 6/6] watchdog: Further cleanup Stefan Roese
2022-09-16 7:21 ` [PATCH v1 0/6] Migrate watchdog reset to cyclic infrastructure 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=20220902121049.1282136-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox