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 7FD7CECAAD5 for ; Fri, 2 Sep 2022 12:12:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E57C84AB5; Fri, 2 Sep 2022 14:11:26 +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=1662120686; bh=EDb4IYvJ77bDDst2btPC93Z0zJO13E28Suq/ez0dFtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=xzKoEwrZx58hOOv8tSADBENDmcjUyaShS5cDh70qNRhZSKW1tZ5+CGOyGxcz8bg/I wEsAB4QEAviRmpt9J30PP2+Y3Ch2yV/q79IoYHvbFuDY87Zw4VcWTUNy5hEnVNKRUo PDy9HoMLkzz+t13iHRht9asnrNGFEtxfWXlKvIywradDh0C+xVKPq6ypNrUmOS+zx3 S0ryUjyp9tbDI7N/AVvUB9YBguy2dfbqiOXOnOSzT+BiubBzfHbH3GE1LgpkYDUegH UmxPi/LnrtYuYeKiTY2WVHWjhf9kGmOtNiT/2eV+CKyJAsJyrO8qRjrPStIEA+TDrr 16JQmoLVbdmDg== Received: by phobos.denx.de (Postfix, from userid 109) id 5CEDB84A8D; 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 5057C84A9B 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 4MJxZw3PlJz9sTF; 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 6/6] watchdog: Further cleanup Date: Fri, 2 Sep 2022 14:10:49 +0200 Message-Id: <20220902121049.1282136-7-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 Remove some now unused macros and #ifdef's. Signed-off-by: Stefan Roese Reviewed-by: Simon Glass --- v1: - Add Simon's SoB 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 /* @@ -20,7 +19,6 @@ * and the legacy 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