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 5F5E3C38145 for ; Fri, 2 Sep 2022 12:11:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA2A884AB2; Fri, 2 Sep 2022 14:11:19 +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=1662120680; bh=NiV1G4q/HqZbraccW8mM9as2w7FRcCK8Rt2Bq51mqKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pGlfNI1PfbJSKs3Efjg0UrpB1yUsfdgNP/Gh3VXd+K6/iEoLlF/8zc8d/JVplVe1R rHxvOOUlnF6UjnfaEfs3D5+/NIauY6KPbJ2Ka1sY/r1P0jUqNFmDmPbg4Div+owwMn OK07rSF7AdLrd+mJoWr3DcKR7/LIDC/g9cjFuSWOHxTt7M5GqxUgT+TYx0qtdGb1CJ FJCBQ2Kf0OuZrneLEKDklIb7rd9J9uZ7S2s/WxhNuSgiOLKAID9FiviLCFMPkXImzY c0TxKWtIfhjLrh3TwCyoxfnk1lyo2IcJma2AA3YWVy5AbTe4lf7+XVozmYCWBaId0p foAHLQSdyn1ZQ== Received: by phobos.denx.de (Postfix, from userid 109) id 64D8C84A8F; Fri, 2 Sep 2022 14:11:11 +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 53A9084AA0 for ; Fri, 2 Sep 2022 14:11:06 +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 smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (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 4MJxZw3Lhbz9sR0; Fri, 2 Sep 2022 14:11:04 +0200 (CEST) From: Stefan Roese 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 Message-Id: <20220902121049.1282136-6-sr@denx.de> In-Reply-To: <20220902121049.1282136-1-sr@denx.de> References: <20220902121049.1282136-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 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