From patchwork Tue May 28 11:13:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940412 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=AEVboP8W; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVJt4NZ8z20Q9 for ; Tue, 28 May 2024 21:14:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6548884A0; Tue, 28 May 2024 13:13:49 +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="AEVboP8W"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 17E8D884D5; Tue, 28 May 2024 13:13:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (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 D6E1B884A6 for ; Tue, 28 May 2024 13:13:42 +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=jpAqkWkb64WMvbYlGPAfJdF8etcNd56wI4X2Uyw9RJUt7D0v8YSlABIO5O+ZnOguTQneKGrRQbN6X/JaBIA33H/yOmF7CqyjOda1wBUNhMWp+U+6m1BxetPqSRz8zKe14pdzJctBNBaL7I6uUBVIbD4V6V7qxEKUThicObYMPULWqNK7jK0sxH1c+c86+6INk91COaMLdiMYTULaPWCuie/tuCmCQN29W4Bjf3ErYW9j/nesD6cYUEf2q1+oeK+mMhJCXwFwf0ZJQAtHTymrfUjtsC9RhErs6YIAQXUNgGL/uFxU4JgWfMajOMp1Mgl8qgF+ulODvXC5lBu0+hw70A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Foi/+8AuJPWs3rLCd5h1Qz+m2AnePfQfzOFC0z6h1v4=; b=OJywI2I1ZJT8pCydAu6DUOT2cZtOd39PE1ZKdzmoUWa0sqKOKQ9TurVcLvlMuAuvre3JJd6UQQ4HX6V5alEZ0C0ERcGxDwSqiNXfc4MeVkDXpXKyqmd82hmrFKRtB1CQLj4Fay+VKVhh1WaUIBTePmcZsZK2x4K7qjHaRoEG4oil09zFZI4D/zFFnMT8f9hFGonOk7ZKc7UKT40fEPaY90OnFBTdza4t4WiOB8ZL5vt1X+Bi+c+PUjW3mgJ/K18h5AeYCchiX9+WQFu+TvuaGUHIZ5YzMGPDuUIbwPnj/YiPGtSx/9ef2SZYj1FiMMSRQ/htAGc+xoEW8gjfFtqoUg== 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=Foi/+8AuJPWs3rLCd5h1Qz+m2AnePfQfzOFC0z6h1v4=; b=AEVboP8WuXiSmzqpAJca9ZG57mxFD8mCTqa1lyzUElMJ/LBOfNnVISpdEMbWwQ9mqeaHAy+NdvL3PrEbPy9wJCynOUs6Rehwlnl7u+9Qd9BsG3HjUCllFFt9Fxb0mIidkLwBPo0yhVkXChy0gnP6tt9sETk1tlbQbDlMJDlWIM8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:37 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:37 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH 2/7] wdt-uclass: watchdog_reset cleanup Date: Tue, 28 May 2024 13:13:20 +0200 Message-Id: <20240528111325.2163560-3-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 694e6549-ae46-48fb-1e9c-08dc7f073866 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: eHaVohIY5WTrG4Xqd3ExCugIvR75ueqf/T7/ntrbCFQMoKTIb+4bN1jDjH/FJYBMyTxRu7OvD/36upaCqKcDC8tu5ImGNA5yUwdTjR4Cu19Bed6+E3Ram+cvTpOj61SXuq2I4Vs186uLE76z5P7hOvPk6NzRZt/uw4eKb8jcLIHLc+TXJZTlar2zCbAAxJiPp9T08jvRFtiN/hNDQ2vqyG4hU7JeZG3Sr/CVW/VOnUSH6ibpzmj5MLJnftjcYjPnGEqLEFtERXN12lRv45wiN9MpMjKJhMLXaY5my7YLzgkasDN5U1YE+pXcPtfp6X81CuBi462t1VAINYJY1eQen7Of8vPNc+ttBwKcUWzizFj5xPBHMBhWWEoBrIrmSwEWw+9vPe+dOEy9fZM+tw2QMqV3rPyP6UK1nu4ZGyfy3SSyad/GO0d0lWbRzUVqy68DnTabbQ/EqUG4NckvXcQaZdfhkP66pqxjl2ZzapWwWOhOE5T8kwv2v78IEP4NIBdyzrhpXs9Xzq/4jH9C0yCIjY4/ReEIMfZIkD9eBAlbCjGqGjGRSyIFUGaSWfgd1jsMmcjOqfX8tfROF5Z2czk13O2G5DmRI6nQ+IOt2MVMqYlw6SKW/DHmEAE6IvF4epvf9P1f1w98q5OpJPvwp/p2HurYc/hAaQENrqSMcrnztIX8Lt+ya1RN8E0pHjbLmbBv4A701o3ma5kwpoWoXzHOzdou9CWEp5oYUxIQVv/qdQ3kwiNIY6uKUgYitNLnwmPHkZq06VBfP/NGgcAL6p74sQxBIXHdmfgnBy32JaPVlIYM3eBrCTKbeE16iyA4BdimMp9sd4+Mg6xqHf3eZHiWuMs1Q5edf7SmbOCz0Ugla1urj/6E+mOOFx0Cxqk6YQwGt8yCB+cu+U7Fsba0CNBaueR6L/gmUTWTwmRADCHHntMSDtLq0RDZu4Azcq9zUymwor/YaaZ+BsQpJzkBNI0kCvM4hFEVmVXAss7Jl/p/SuQkuKZgnQvD4K06n2mGwoRxipKskfCMzJg+pSpSFwqQ2B6xEigZZwvCy9EdVNbbxi/R+JMoVwvdEKjijfexAEuoLIFgVvI1DSIiMnlJNIBAJGOSGYHspnGlh+7LkM20mzpgaCRohv3pdgS5eZOK1xs59mzX167MFrCC91GKgrfC/81WXNg2JOVUikNrtrLF5gfIjrmBg5dd+27xeGiw+6H/YIlzhgqqHGeQYojrwKVW5srC23BRhoaKB1ThhS0BvCXawtxt4jjVPS+z/oyeXStM2ea4AoVqUJkzCjEtspHO99spJqO8ONigwPT2EDk8v9NiBYTSldVcLbcK+TAY167KDAY3scPsHZHIsvczeb9vHw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Nqn4OMfnllTVYLIl7uHakFJRyLQkkp+1BvhmiNvO6XsPHSreR2xS2tNaiuI9bhoBHXsBwP+sAdHh1U5A1EeSocPd+/37zx8gOlnnO9Mo6LNqPe0tEAYICruLdAkimx10NDt1c8UmqIoPtzfbrKaex8R2RIFwww8Powa1X9ZzcE4wI2CyFzU9N/+BqFxt4r9/MAI7g8QjDdN7kqbLw9mRYuzvUIihmZ1NEiTe5zXBJCA1F8f21G6LLxbCptw+m+dcf/0DzGxxxDLgEQN6RGzlaYpDZFFobagjEj+TowFXb7zlVOxueO53lctiSz+5SPf3fVD2KSIDbG3ktWbNXYlGB8+PnfOSwx+hIXLLtLXLZ7JhXltd2IBOuuhv0AfAwiUlBN+whWdUr6D181ol8rRbDVr9IEhdcwa52Wb4pBylonvg2/NrZxNIPLV4pd4cmdaNx8igM1+v3cvL3RCwfXXabuzWLNGqUylWAClcOgULyb6tHHBl2CpyW8c4txChmv7Gokn50Z3JMA2d/wCnxVv3grCUsCvq25OYCtcWIucOnjI1mJ3a9RQE+x+f6Ewq4GzXEX9LLcYdjx5Mws6dbA11yM6Sa/ugg5bbUbXC8gGLCI7N/fmbOFgYWCgOJ3l/Tm8+skZgKpTDSpKH1TCHKjzaLTGlKdpN1VLbkEfLZf2EE5jItwHdFgCd0MY9Ls3WZkVJDLTf9f+mKIeCotlfO73cIZFyAASgnWx6cf5X/UXSCuelndcHBiEk+xcGF4q4xy1l99rFED4/F7/ZgBnw18HOavW5pvw0TL5teDYXZhUtFTMPczjzhnLXOkaPxP370I901HR3ae/qcj+vz57c9cS1TDoWJvuV3qXOk1cpULAdwjbd4Zq4HXD5wF2QxSnl2dn9abyHKP+PnuP9/x3SvGbry0IzX6jZPf/4IPFO5en8QfP4cq26DxaXkUZ8fFZzRD3q1hIVjKr+l1eSnLuuuUlI/gLgPpuY++tuNnrrvZOXJx1VMPf/St2APWY8UfsVzNk5Ijaag/FzPDRl8uPP6dfeJk00v2YQWqwig4+cfoX57CpvMVhg1vLFZexA2iuiTggltH+NFTPQvwdsEpjDaJnBF12Pe12kVS04cezn/0V2qBP1S/TRii3ap4UhITuxHs86qUQHc2AWksx2Hvy3538epnxcsdBCrsLS/gL+vEnf3Zy0dNn99SxbJcUiIRd2IvZzjOYQEmoO1JkAqbie8GtAMzUKFxjscOLE7ezO1rkyQISgjlDQqzmHkzsH7JOrWER5pGwkRcRaC+mG5VLudB2hPuXwACpk/igsWnvgQZe7i2HBo7H4sSsJX+ndB3qpYcMEbFUEd72uayAnqz8w+NpJ4uRebEkJ7RD7MMdNzSo79jVjcCMFwhf3W3eyrwGiAFZT5fgB6cZtUKf5yx/AfW22qgfnrKO/0FhaOi+B+c4H+2eZcJcd3hKYx/4lGAu/rnlHcPy/e3FZ3u0eAPb9CnQ3KDVm7teHiV+xT0kh3kH+/AGdnLLF2XVpvJFD+E4CYFgAjHhheHiI/qngz3fWk3jMiIWm90xdtntdLhLtlV1AHTtCfz6MlG9toSjeEdFeduWuZH3WL+GBHFbw/umlgkbddQ== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 694e6549-ae46-48fb-1e9c-08dc7f073866 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:36.8856 (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: JUi20FxJB3AXe2Rjb3MG5R6BpxwfigGZFcYug+f9xTJYB4XrXWQhro9Qdf40d17hXI4gCgLheSgvcJzOYeMgoaJuufgYRozIHwF67QWAHXc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 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.8 at phobos.denx.de X-Virus-Status: Clean watchdog_reset() is no longer called from anywhere, so we do not need to define a dummy no-op function. Remove that definition, and update references to say schedule() instead. Signed-off-by: Rasmus Villemoes --- drivers/watchdog/wdt-uclass.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 417e8d7eef9..918f31d6b43 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -28,7 +28,7 @@ struct wdt_priv { u32 timeout; /* * Time, in milliseconds, between calling the device's ->reset() - * method from watchdog_reset(). + * method from schedule(). */ ulong reset_period; /* @@ -222,21 +222,6 @@ int wdt_expire_now(struct udevice *dev, ulong flags) return ret; } -#if defined(CONFIG_WATCHDOG) -/* - * Called by macro WATCHDOG_RESET. This function be called *very* early, - * so we need to make sure, that the watchdog driver is ready before using - * it in this function. - */ -void watchdog_reset(void) -{ - /* - * Empty function for now. The actual WDT handling is now done in - * the cyclic function instead. - */ -} -#endif - static int wdt_pre_probe(struct udevice *dev) { u32 timeout = WATCHDOG_TIMEOUT_SECS; @@ -263,7 +248,7 @@ static int wdt_pre_probe(struct udevice *dev) priv->autostart = autostart; /* * Pretend this device was last reset "long" ago so the first - * watchdog_reset will actually call its ->reset method. + * schedule() will actually call its ->reset method. */ priv->next_reset = get_timer(0);