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: [PATCH v2 6/6] watchdog: Further cleanup
Date: Sat, 17 Sep 2022 10:14:50 +0200	[thread overview]
Message-ID: <20220917081450.21549-7-sr@denx.de> (raw)
In-Reply-To: <20220917081450.21549-1-sr@denx.de>

Remove some now unused macros and #ifdef's.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
v1:
- Add Simon's RB tag

 include/watchdog.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/watchdog.h b/include/watchdog.h
index 91506d3327a8..ac5f11e376fa 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -10,7 +10,6 @@
 #ifndef _WATCHDOG_H_
 #define _WATCHDOG_H_
 
-#if !defined(__ASSEMBLY__)
 #include <cyclic.h>
 
 /*
@@ -20,7 +19,6 @@
  * and the legacy arch/<arch>/board.c code.
  */
 int init_func_watchdog_reset(void);
-#endif
 
 #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
 #define INIT_FUNC_WATCHDOG_INIT	init_func_watchdog_init,
@@ -38,11 +36,11 @@ int init_func_watchdog_reset(void);
  * Prototypes from $(CPU)/cpu.c.
  */
 
-#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 	void hw_watchdog_init(void);
 #endif
 
-#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_MPC85xx)
 	void init_85xx_watchdog(void);
 #endif
 #endif /* _WATCHDOG_H_ */
-- 
2.37.3


  parent reply	other threads:[~2022-09-17  8:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-17  8:14 [PATCH v2 0/6] Migrate watchdog reset to cyclic infrastructure Stefan Roese
2022-09-17  8:14 ` [PATCH v2 1/6] watchdog: Integrate watchdog triggering into the cyclic framework Stefan Roese
2022-09-17  8:14 ` [PATCH v2 2/6] cyclic: Introduce schedule() function Stefan Roese
2022-09-17  8:14 ` [PATCH v2 3/6] cyclic: Use schedule() instead of WATCHDOG_RESET() Stefan Roese
2022-09-17  8:14 ` [PATCH v2 4/6] watchdog: Get rid of ASSEMBLY hacks Stefan Roese
2022-09-17  8:14 ` [PATCH v2 5/6] watchdog: Remove WATCHDOG_RESET macro Stefan Roese
2022-09-17  8:14 ` Stefan Roese [this message]
2022-09-17 14:08 ` [PATCH v2 0/6] Migrate watchdog reset to cyclic infrastructure Tom Rini

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=20220917081450.21549-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.