diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2024-07-12 11:07:24 +0200 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2024-07-12 11:44:33 +0100 |
| commit | 6c399b31c6362c1683735adaab8070c734a7866c (patch) | |
| tree | 81c0f8458aef35e6ebac1f9753ceef92be373d08 | |
| parent | c06687aa0649d1ecdf42f3d09e2612b228554b4b (diff) | |
arm: bcm283x: remove unused empty hw_watchdog_disable
This empty stub was originally added as one branch of an #ifdef in
commit 45a6d231b2f (bcm2835_wdt: support for the BCM2835/2836
watchdog). That incarnation of the rpi watchdog driver was later
removed in c7adc0b5f98 (watchdog: bcm2835_wdt: Remove unused BCM283x
watchdog driver and its references), but this now unused stub was left
behind. The later (re-)added rpi watchdog driver does not define a
hw_watchdog_disable() function, as that is properly integrated in the
watchdog framework.
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
| -rw-r--r-- | arch/arm/mach-bcm283x/reset.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index f13ac0c6375..808a87daa88 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -25,8 +25,6 @@ /* max ticks timeout */ #define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff -void hw_watchdog_disable(void) {} - __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs; static void __efi_runtime @@ -34,10 +32,9 @@ __reset_cpu(struct bcm2835_wdog_regs *wdog_regs, ulong ticks) { uint32_t rstc, timeout; - if (ticks == 0) { - hw_watchdog_disable(); + if (ticks == 0) timeout = RESET_TIMEOUT; - } else + else timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT; rstc = readl(&wdog_regs->rstc); |