From patchwork Fri Mar 13 16:04:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1254500 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=Meg1/hNS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48f9Xk09Zlz9sPF for ; Sat, 14 Mar 2020 03:05:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FE01814D6; Fri, 13 Mar 2020 17:05:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="Meg1/hNS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96CB0813CC; Fri, 13 Mar 2020 17:05:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on072c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BB8EC81269 for ; Fri, 13 Mar 2020 17:05:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PfAwOdik6tr56rbF9jPjaLrZe0JnX/x8PsuBqBSa76OzsJe63r+z4eeKheTM5nPXQ0ISrDo614elTWwXIZlmCPmnT/P02Grn26QJfy6eBFTkq2c/EscEFsVffvXjvDrBlcwXu3piWinju2KWOeqHUY/BcskjZh+IfmBzV5Iqqeh61SaZcxnRXp046a5Q0vp9S6OqZQfqKwT+9YXwiq8EPwHy4gOUZJAxqeMfNgNdpOxIcnbnjVGLIu2mnPePIdRPsD79JbD8v0L1hpZhUw1k/8gN15OFoKlWirrp4aAO3GffynoZGIV5r/0XeVcBUXTTWbwRD+1VJUFK2cPntWky9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tlpnepcsyubmPpzu7VR21oFdKkp4BuCfO35SR0MF9tI=; b=CRJ7E0xE/68qMzmvFAxUP/wfaC8YmQAE3x/XDN6YqaS70ORK8E6I+JxEWOCr3aAw/mG7VAexkdcHuI6KUhrn6PRTtMWkK15ouVlNgxymraXuOmWw/EZ/6GilTuF3CiP7ADvVf+BQ5xi35JdNNn6s8Zh1dZqVYuy4A+UdRLXPQy/aygfn60Uu19yVR3Sa4Z/JHMiT9DnjeF+vSzpkW5b4RqrwoGAAGPY2NlRhtclkhCbYhFIB1KKohwQd7jV9LMbaQTwI3kYIslxc38BFszON/YagmAr/Had8CzvhMjJ6Bs/yAKkTPoPfMi+QK03PUOV4ApRfkLzwt5E8bo2ZlQuAoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tlpnepcsyubmPpzu7VR21oFdKkp4BuCfO35SR0MF9tI=; b=Meg1/hNSC3C1PjBs4xvpns36X/Gx+kV2/IgIORICqaxxwEBD+XiTLPC1F7RJXs4A91Cf7py8f9qcfDLU26rKN3IH1C1l5YBpY+FpebF3qLqaKbea6IpFK/MPSZIb1L8+ZCTi9/fobEoi1EMZQ93kuappOLYiI3aOd0czc7wCtVc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB3519.EURPRD10.PROD.OUTLOOK.COM (10.141.128.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.16; Fri, 13 Mar 2020 16:05:08 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7%5]) with mapi id 15.20.2793.013; Fri, 13 Mar 2020 16:05:08 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Christophe Leroy , Chris Packham , Rasmus Villemoes Subject: [PATCH 1/3] watchdog: remove stale ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS from wdt.h Date: Fri, 13 Mar 2020 17:04:56 +0100 Message-Id: <20200313160458.19727-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200313160458.19727-1-rasmus.villemoes@prevas.dk> References: <39e2b876-6ba1-59b6-4ddd-068e120f9b4e@denx.de> <20200313160458.19727-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.114.43) by AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.13 via Frontend Transport; Fri, 13 Mar 2020 16:05:07 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.114.43] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb716570-19ac-41e5-7c56-08d7c7684ce0 X-MS-TrafficTypeDiagnostic: VI1PR10MB3519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:169; X-Forefront-PRVS: 034119E4F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(39850400004)(136003)(346002)(366004)(199004)(316002)(8936002)(8976002)(8676002)(478600001)(2906002)(107886003)(86362001)(6666004)(81166006)(81156014)(66556008)(52116002)(66476007)(54906003)(186003)(4326008)(1076003)(4744005)(6506007)(26005)(36756003)(5660300002)(66946007)(6916009)(16526019)(2616005)(956004)(6486002)(44832011)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB3519; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; Received-SPF: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5xMdwio/c5TGD6VNu5AQkgMwKnhIY1l6kiPVbw3IrQd2a5HeMnSMBgI0geoupW6Bp60lo6CYzXeOzF3SQlvkrGALiHBVju+VAv1Sm/Lo0bNu+ae1UMifAa/GE5rSTiM8YQOBSyRoc52BsicHDrFuLKGaA3+HbdJWgeVoTr/7Fe2QPnnlJh5tTz+cmuwoNhVH4mKquZF/QawXYom8XFugGDaHPjQn1Bnq+cNWQyhCHo72hXjsCSIY9wQXdGGsmcgJF1L1y5q07n+bhYHDJ2V9ig0PbmW+PwG7oZ7YBTZiglSTgX2FKW90RxWBzH5Szq2O5XIpYuc7hynMp2X+/UUIce5FepqKHzCqxYF/y0H/Od3UBbGDvcYJ2DdGGL/aIf21OZ1lbSySEIcqkW7oURxXc0xE1aF8JhSjAMdMh9Yu3tlEEBVp3U4EELp/I21x1RDL X-MS-Exchange-AntiSpam-MessageData: NWjb0lekGHi4SYO5ZgKsYy/7XOgM/TG7AH0iayMScDZVv5wMuqSOb+MkN/JPkBaOxTt109067zexNR/tGvhs/3+484433r3pbFZT/2/ECpD3eOJVIjNnAPuHJ72mGlFSCS5CbdqLegjduRhZnDPxdA== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: cb716570-19ac-41e5-7c56-08d7c7684ce0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2020 16:05:07.8739 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VxXoboiwGvqjvP0Q/unrzAXBH9b6zExQekR5Qy/qeWXqusMM+BGvvV570l9M+/eWGO4XBWTRoLEsVCO22m/6uPrG7C4mGJOk0rFogjW89Mw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3519 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Since WATCHDOG_TIMEOUT_MSECS was converted to Kconfig (commit ca51ef7c0c), CONFIG_WATCHDOG_TIMEOUT_MSECS has been guaranteed to be defined. So remove the dead fallback ifdeffery. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- include/wdt.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/wdt.h b/include/wdt.h index 5bcff24ab3..e833d3a772 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -107,9 +107,6 @@ struct wdt_ops { }; #if CONFIG_IS_ENABLED(WDT) -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) -#endif #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) static inline int initr_watchdog(void)