From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3ECF0ECAAD3 for ; Sat, 17 Sep 2022 08:15:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B86D84BB1; Sat, 17 Sep 2022 10:15:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1663402512; bh=R8vSynOxgDVAAlZNyL7kcm7mGsLGQurFZNdTQN2hS+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NwmCVWyln25+78ofMuqEmC+T1Eetfa2+YlqPgRZJ2ICqIjITMXuSJcBI1gJ6CsfDH SDALvRiBU6CSNzsR0JoDpOFmRSGH8SH04B7H1KCHVskVBWtUWlHZteHF0AHRH1yngW Vt29mPfasNIxGKU6WdpwFDAhM7nTM/sRaXKN9JqkMd0uwXHFUOgB6fRszCnMJR8vEW UOtjW+wt3kTgb1n92EXWc+eFgu7h96adoNSbqNVYsx7+nEZ8Kk8wmlVUtYNnWgZMLq gfJEhzRf/v44kBBWIAeccNPZOSZ8D0jNNCk7AOZ/LNc1kCJJYK6lXhiXHkBD7PIZmX u/xyaWKaFhkKQ== Received: by phobos.denx.de (Postfix, from userid 109) id 7853E84BDF; Sat, 17 Sep 2022 10:14:58 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:101:465::107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E66E84BDA for ; Sat, 17 Sep 2022 10:14:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4MV3dT5g7tz9sQK; Sat, 17 Sep 2022 10:14:53 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, rasmus.villemoes@prevas.dk Subject: [PATCH v2 5/6] watchdog: Remove WATCHDOG_RESET macro Date: Sat, 17 Sep 2022 10:14:49 +0200 Message-Id: <20220917081450.21549-6-sr@denx.de> In-Reply-To: <20220917081450.21549-1-sr@denx.de> References: <20220917081450.21549-1-sr@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Simon Glass --- v1: - Add Simon's RB 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