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 X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44C56C4338F for ; Wed, 11 Aug 2021 12:49:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 58C916056C for ; Wed, 11 Aug 2021 12:49:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 58C916056C Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=prevas.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F36982DD6; Wed, 11 Aug 2021 14:48:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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="OVFJOxWe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C236282DE4; Wed, 11 Aug 2021 14:48:31 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0702.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::702]) (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 9F2D282DA6 for ; Wed, 11 Aug 2021 14:48:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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=EjwAnmE60ZOEvHPsdKviyfj6d6rlDtj/za159EWZeyAVaLSmk7ulTDSPfL2oajd5e3dtJ/mzw2U+hmMy+j6DV9Zd5ktfYjmbY0QrELQrK4O4bxp4EaVDbvrn9/7HZqJB9kEcqS6UwFvQXYb7EqPTlzNrZx9QNkDZCdCNdMCRQOE1S5J8G8bebPfLnEgVHbXJ2lAedUzSuC1AdAjUwMgeo97GZ+vosSN4JHX3SiijPG20pI7uERptt7gmd1lt34yzIutkyHEHOXxIO76LeCPREzXRKC8e77lmVaf8Rv0uMNZxhuIFQ10yCIcmEix3N2DU32w9cw540+Kqxf52UoAnaA== 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=ofIUSYqxfIt6NbFYEdQecYA93drO+DsxIXIQ6sTDP8Y=; b=BqqoYxZeCuuCGG+cmSmQ10PjrTRZJtU3nTr5sQ8QKteQPDDggIBH2armqY3S3cslmLA4m8VLx7Pa2PEH6uIrMPtcYBaFzR+Tt4kDFzqYzRc5KiqCS/Djs2V6fV6cAUmqzMHbG+HU4qClRhqDxEaqo8vbMddZ1FKJzn7VECkZzUKU5yF3LENyzyTIgT/FmUZU3qgXSWIUwYVTawAUnBqv1eL1scrxZDn+YNDIhpvdEfrMosWyoduOSulG+7AT341Ht+NS/NPELXkEt21eYkMrEZsY9/Yz/NrjtH6xQOVHR1HcaV+iBTKbXd0W6r+BlB/XNYnQ02H1QkAAqZwZsCuDfQ== 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=ofIUSYqxfIt6NbFYEdQecYA93drO+DsxIXIQ6sTDP8Y=; b=OVFJOxWeh+1Tmh78wWKY4GuHrwj9IRdaen/1bQ+JgaMkn3jHp9zDF6nSWPjG0fU3C9jiNEEUh1/sRvfMhCchUnBV5Q+7EEnyOLUs+lIXh2qH8YK0gc/dztb4mkIJw+0n+oozx4nDEs9D9Fb0sF7TNWhuVRgu/xlOlJ2vi2e3Zzs= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) by AM9PR10MB4561.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:265::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Wed, 11 Aug 2021 12:48:15 +0000 Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb]) by AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb%7]) with mapi id 15.20.4394.025; Wed, 11 Aug 2021 12:48:15 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH v5 08/12] board: x530: switch to wdt_stop_all() Date: Wed, 11 Aug 2021 14:47:56 +0200 Message-Id: <20210811124800.2593226-9-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811124800.2593226-1-rasmus.villemoes@prevas.dk> References: <20210811124800.2593226-1-rasmus.villemoes@prevas.dk> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: HE1P190CA0049.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::38) To AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (81.216.59.226) by HE1P190CA0049.EURP190.PROD.OUTLOOK.COM (2603:10a6:7:52::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Wed, 11 Aug 2021 12:48:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdb8753e-b235-4f3e-0e68-08d95cc6494d X-MS-TrafficTypeDiagnostic: AM9PR10MB4561: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJa+1BzwluIEyyloItefohZDGcl7UL9H4f6BgjnBPYNBnjoDh+2yahI5xAFbxOrDUpElJjl+NAvVkrSD3N18roXEJcJVfj2lRWOj0JnRbl3gy6o11aSdSxBkBDlXnQdLDtwalgr6Jh5/vOVWeo8g2uD3Y2dMi4/nA1EWJGJ1F9oVYNvciKF0KdMaafXhUcpRayCs2vnFeU+l0j+WXnwvW9TY5us9gu/kqFd0RWA/Ez2Lgaed7YSABRQEP8R+C00nAUvVaK8r7t+s0UqdG2YEFvf7qh/K6UROFrFkFIaxwTrabQvIgkEOrxza0RfS2zV2E6G1UC2GcWFtnMTixV4bJZeHuekHCCdWdt3VFLFZ3ntXR2OO2SM3bWjYCbUMqCjSRDMqdbUa2M1vyGqiQ/BQAP5b1Un+e5x0hL7LBY3QYD495W1ArQWfiAIb6mE6Nwlp2gaKrmN0zr8ZtIBudFDK5+6rTLTO3XwlLYk3KPVUpZgqgb2ad4aGJE8i5ScWjzYgt8XhG1S6zIbt4Ei8BxXMVlesJTJYktLVGQ1h6CQyDZq7lik7KQHfM2a2NP8ffq1uCLKgTRMXnB3ny9OzhzrwOJvBH+1S2mhZxK50qsd9QJthOFGfDK57xY7g59c4AxgVb2D3/9TB1UX1yeAQRGDe96eCCqndmBYUID11rB/d6Nef4bTD375ai/BblMWz4HONakqi11nVYuw455alnfhvCA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(136003)(376002)(346002)(39850400004)(396003)(366004)(186003)(44832011)(478600001)(316002)(26005)(8676002)(4326008)(36756003)(6666004)(6506007)(54906003)(1076003)(52116002)(86362001)(83380400001)(107886003)(2616005)(956004)(2906002)(6916009)(38350700002)(38100700002)(8976002)(8936002)(6512007)(66946007)(5660300002)(6486002)(66476007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ljP6KUWh1+hmPPZji7jKip6YGQ1wNm5w5lqOQ+1AB8jkeX5KSLOFfn6Mjl2a?= =?us-ascii?Q?YSrhLnqW7iIuZdXX0KfDYXpcJWZjdDRKbh9mUCUSLI6sCs0JlRr7y5D0VQil?= =?us-ascii?Q?1UWl+GWjZGe+fYB6dhhvyg/30oicdTMcF0wFE7aHyDeS4ZVT8zyRvizZxXo/?= =?us-ascii?Q?bj/7dj8kudEx9JPAVRuT1zTAsWl/aIScapycLn+4bTQANpm5OOo/oRuqnQP6?= =?us-ascii?Q?aAyhFSCcV0Quo1kDvZwHNtQ+rld9Y5bJI0V4JMjDc1u3/tsDw31zMcjnmBoh?= =?us-ascii?Q?1fQL617QUdDuxnIanjbA/e8NBXrCTqHflqTJXkcvca+cDN2eOqpCjRbsd0LO?= =?us-ascii?Q?nZ1s8d9EdNS2aYH1y8AQKiuYybdpEYMur50eS1+6gAW7ZRr+piumjxlri5RS?= =?us-ascii?Q?atkx2GjazjGLHBC8vsgEwBW+eQRlbq5O51uqzGVbLolSJYDO9Y4Jw827zHDg?= =?us-ascii?Q?tJurCugX9j+c3oHd06uK2SnKM/h5D51R7S7R2BmJBrfm9wem9Pla9UAwB8xJ?= =?us-ascii?Q?86E5+QvUuqzQfoyIBXDdhvQqbKsUnvE6Y8EgHz2S0HNUmbMB6zSBHrICRoRv?= =?us-ascii?Q?mDu9YeZ3pnsOUeufvnGbz6qwPnT0a2w45t+K7TYaSoduV//yo0Lbta96YqEU?= =?us-ascii?Q?nNGhCvXdc5/ELYlKsIZpVt7rmJuN4LVYklItayuqyRFTEh2DQd3cJ2M/iY3F?= =?us-ascii?Q?rslh8+xqiDtbVS8LSM2hP0qHdz5UaDr+nlx8u/e6UTjdMTELkyjf8+NPjROt?= =?us-ascii?Q?P5vJH0fLSJKsZjFK+OaL+ZyRUtjv5m0+qM8/JXPcbzRQkpKvuoR8m1/QlrRz?= =?us-ascii?Q?3+93vwa0KF+ZZ9LGnqG3mQXIOhQ6uN42GZ8Uli47lsIGtHtOlEKtNehcjyiJ?= =?us-ascii?Q?jMw4MVmrnjf6Da2g0Jeqz1qE3/gCUG5taG8gNdX0ZjAAZY3PLBdshujUyv0+?= =?us-ascii?Q?7lKL3IrRBr0oEBiKJArXogvcRlc26FpEz3qIhN2X7scqvOEAItuI4EtcfM+L?= =?us-ascii?Q?91qdiS85JUpsRqxkuunB62ARh0lPgjaIriD+EjIw5FqDnlejH+iP2cwPgJHj?= =?us-ascii?Q?KuZfFAlo0lvNFAirZ+n/29A8mMzdxR989rfGTjuO/N2NggHOFyhC/AR68UfF?= =?us-ascii?Q?RuYTVbe6yy3KC6A5scHuRF7fRr+CLB5iGGO6yB5FnmhqHL77FYTam0TDFf5N?= =?us-ascii?Q?xz1WzHPwtW/LHhJdVIfMHrLy/IpmYlERoS9i0r0F1JDfJC6RCsclBViS6ddV?= =?us-ascii?Q?v8KsIiWeRLBTdiYgiT/ymfyFGQk/jZQeK9wxtpIdxEZs1ufqRydCSQAt/Eav?= =?us-ascii?Q?4dsTAxJuymraC6A23Tk0LMvR?= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: fdb8753e-b235-4f3e-0e68-08d95cc6494d X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 12:48:15.4371 (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: h0UpiP3/Wy4Pj1PLJyha1mjLAfsssuI4fpyByjfVkOQVzWpLau4M+ahzYe6QqphNHzIVNcB+9CiIlInPv8CXrZsz/yW7DxC+k2jQy9d3zLY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4561 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Since the gd->watchdog_dev member is going away, switch to using the new wdt_stop_all() helper. While here, clean up the preprocessor conditional: The ->watchdog_dev member is actually guarded by CONFIG_WDT [disabling that in x530_defconfig while keeping CONFIG_WATCHDOG breaks the build], and in the new world order so is the existence of the wdt_stop_all() function. Actually, existence of wdt_stop_all() depends on CONFIG_${SPL_}WDT, so really spell the condition using CONFIG_IS_ENABLED, and make it a C rather than cpp if. Signed-off-by: Rasmus Villemoes --- board/alliedtelesis/x530/x530.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index 7bcfa828d7..8b31045a07 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -121,9 +121,8 @@ int board_init(void) void arch_preboot_os(void) { -#ifdef CONFIG_WATCHDOG - wdt_stop(gd->watchdog_dev); -#endif + if (CONFIG_IS_ENABLED(WDT)) + wdt_stop_all(); } static int led_7seg_init(unsigned int segments) -- 2.31.1