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.8 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 45493C11F68 for ; Fri, 2 Jul 2021 12:45:44 +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 7FEE4613E1 for ; Fri, 2 Jul 2021 12:45:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FEE4613E1 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=prevas.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F199C829E2; Fri, 2 Jul 2021 14:45:28 +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="Km8L6Qop"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80C5A829BA; Fri, 2 Jul 2021 14:45:25 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20718.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::718]) (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 A9AD681EBD for ; Fri, 2 Jul 2021 14:45:19 +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=GLUDtTr1cRUAzzvCNri3mtJfXEeXAx6kWjQ2ZtApctEsWrTNhlvltnqxVY6PuI/FHjyfi9bK7QAQdcfvEr//HE6JjXfBfBK+dUwWB4PYqsorc26LAhTcE8aY4ZMKuSRIfZwRUdZK3HJDyAZeWEf+KRs6LVHiJ/ychmZXO+UpJq2wzPvMPS8+nJ0aU8P9u9Kghu3yk3TSYxyJvU+z44RlFf8ig/OYmW5/2aDvw/EpmpIX/Y5u3RG9jG+dclHTTKfLCwdU3oT8+ccCCeH6TC54HYJC98Nwm1wGQQSqu5S+p3iQNJtUvrN2HsBooBU3AMeH7SD8dKJMZSDHz72vpCnGbA== 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=E6KEW3FA2Bu0DKEms2UpXSnkVeSVNMiremXNtp0CPfY=; b=TL/ij+nGYR1DHhyhgdeH1mEfxEnJsgwzEaNsOkYU/30YSyKQ9heU5MmRaRofLQUto17OaXHinNkCFLTuD+9XQZYlVTvxI8UWnndkoGFCGKyO3uqiapGUMeo5kha8TSBgfb5Kov6PFfXNoFn9BdIUFlR2XzUjvsWE9MnlseEu6ZaQCQQAWuFyYcbhQ1zepEwfl7WBZT60YwoYtyp3iOphwUZk/vYKNuQiJAD4YE3ySkmkYf6OSupiDjWFneYUUHnqIx4ow+mHPPTYmiZTTqkzi84xnW1YTFFO0ld4B0olieTInHPmLMqIJ8jF79jSYjzCgWM17vJbvi4nNoxdbqOXsg== 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=E6KEW3FA2Bu0DKEms2UpXSnkVeSVNMiremXNtp0CPfY=; b=Km8L6QopLTQIn1WH0voIhZmqCKh9fUP2j1ztLa2dNWKrQaxTMWGks2RYgwVcWHyyu895omLW2+0PAYm/xblMLulvy8jZE2JRISNDcUQrjzevk4VmxPOlgUIG1shoBqV7DiTZq0Ivw+eEvf01uA0OFRVz3KU/gTI+U3BXXqypukc= 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 AM9PR10MB3990.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1cf::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Fri, 2 Jul 2021 12:45:19 +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.4287.029; Fri, 2 Jul 2021 12:45:19 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH v3 01/10] watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() Date: Fri, 2 Jul 2021 14:45:01 +0200 Message-Id: <20210702124510.124401-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702124510.124401-1-rasmus.villemoes@prevas.dk> References: <20210702124510.124401-1-rasmus.villemoes@prevas.dk> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [80.208.64.110] X-ClientProxiedBy: AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::33) 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 (80.208.64.110) by AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 12:45:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68781008-2f9f-4e0c-e8f4-08d93d573fb0 X-MS-TrafficTypeDiagnostic: AM9PR10MB3990: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QB8vSHpBcjmOyoqgTehzMX6vr+IOznp/fXumQciztJImcdKIWzsmiHgNcMsNxxplVNInpJlTWb86WoJrg4t5zYW+etYE9g8A4SgZk09WJzBmAlRFpd8wExnofAA4G8YN0cjoPc2XaNNL6ZdrW2KKzOhtcuK1OAhbqjZA1cKBQC4BmBCpoESw1HHjKQ6HJnBJYrQ0Uawcb6kOFb+e5baBzvbyBgog2AiR5wTMDOACIDVyvBxeUYG0Q7Xdbwu9Ah+LB0T1ZVxnWrFOQ3bdk86o7aF/hiZDTL8U9fHmyxGRAWEjmyvTJZT5e1Bf8H3m0oJ3ela9crdNdXwVPwpipRS5g073nzxeRWhz+DN13vo9KLmHkycr0TNd7kYm/HOVluQ+xVMJup2VvksQ4oEbcslMmQAb35mOCWMX6QATENUV26R/Zv9RhI2cdC4YyKHpPiZIzzr2JXrDFIxJFfLO5nydf8b5MABdb/dxK3LQaTEW6PBaUykROtxUzt8mTl4BPtJAC2pBiVsOua2X9a65tWePziNMH0bHRQpZX854MFZTAReDvZ/R6qakOgYyv76zFJfaQJg8aX1xBvy+cIoGxPc2dqsj5EYxmdyS1/Sf+OjkdPpex1yJWbsP4qsxekrmJm4XsNy9tIWIfQstKLbvYDKsLOgZl2iU6sCC0mDLBbE1a9y6kjuHfRsx6Mdl4RLoJgB7RjPykWWxBvpW9mIHdSEMYA== 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:(366004)(396003)(376002)(39850400004)(346002)(136003)(5660300002)(83380400001)(86362001)(8936002)(66946007)(6666004)(6506007)(66556008)(52116002)(6486002)(8976002)(8676002)(66476007)(6916009)(6512007)(186003)(38350700002)(54906003)(107886003)(16526019)(38100700002)(44832011)(36756003)(4326008)(316002)(26005)(2906002)(956004)(478600001)(1076003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lksWZ5WYrtaLWz01tWJKCX3v0ztGFny9fPlbqfMOBftBxXlXZi6DnHIjY33z?= =?us-ascii?Q?5geb7YnkSWIKTphxuX1kpsQMDc9MnbuusiT8zdecZgwfNzSagYwiyD8jGkan?= =?us-ascii?Q?gjDYYyGxiD6kVhH0wtPiw20uOAdAApy3QIpgYia10iJvoixF+am3p44Tsbei?= =?us-ascii?Q?QgS1WuWD9A5UGnJ7gJCtJRD1Et+/1XDKtw68wRqHDl6ztSU07d1trfmXJU5i?= =?us-ascii?Q?0gUwV6JxSvz/oj8TWMQxlKVtHQA7vLo84in5CvT37eKvGuG6NI2TVK4hDYWm?= =?us-ascii?Q?S00iNQ9QE/SFJQATIPD735I7TGN8HEy+nY3xj6RZPN2Hw/HTmGo6KBJsjU8Q?= =?us-ascii?Q?QiZHNKCUtxBGAzxmkF9seksVFKV6V3SW0kCNBjgzh6F6JXSWnEc6Xemwce6k?= =?us-ascii?Q?yV7/Cup6TQuZTbtZEaAV6H+0wtmRwKxqMFZbTnt4wHZGiV72u6u5N1da5TfQ?= =?us-ascii?Q?zm2e8AWAEzNZweWIZSzsRRXPXighL2UiKa/9Zml4DZ5N3x354I4Mj8XXiM8+?= =?us-ascii?Q?8jHClyLdVrND7QN0d4IB/WWfOHclZZnv7ovkLY3I8NGsxVx6zdY4WCEU0JRq?= =?us-ascii?Q?z+1AJJ9w5rv6j6tsnnj6XvtxfGMj4nyfT8YEF0P55/epT0dcGGqayD9G7x5g?= =?us-ascii?Q?u/jldzOw0JO5APhQdpiRwBzvUQh23YoE4sc6A3cyGkmtoEgVl+9Yk3LzEV7B?= =?us-ascii?Q?zi0F/TS30FjrEEzFOfw7XsyX/9DRWARqNz9ViocZM7jzJ+k3zrZLycpvtsL7?= =?us-ascii?Q?jhnkpPUCoqc1ozHfAX76rFTOEa6dhOqJxCv3zucXbfMFk09vCHgjS4qiETBG?= =?us-ascii?Q?bsa/ML7gUKk858gxh9dbPCRv4mVijdxV6kAy0hjeVWzAA0m4CbVyuRT9qIKH?= =?us-ascii?Q?/76Jzrq60ZpieP0cuQLHrEZbLIV5t8DZnb1ZUIHC+wOyyboSPXg3U65Tx/j6?= =?us-ascii?Q?4puHDgto3rkqR8gSnH0g0AUucD11+vd/BjSxYCc2kIN68PMV9MrVve6yB+o8?= =?us-ascii?Q?5neTvctJkltfhWX9yb/yB7GsWWD9/KmSVjACFtyW3YgZhN1ZzWWZ/SkHhCry?= =?us-ascii?Q?Y0vfoDU0bhtyx/LK5bwKy6/CvVRtOnEsEBT0HM2ZdB3VDMXw70Injtzy/9hD?= =?us-ascii?Q?G/mm+KwWxXAs2EzGT8HNAQbpn+wghsUWvsLRKhDt0fhEOSCaVyadW9zfpFh4?= =?us-ascii?Q?C6WC4Xn0faK2mRlh33C2milMJV9NfG5tRDGcakk8znrbomP5IIBrR4NgPw6i?= =?us-ascii?Q?yA+Cr+5HHA6mz9BYJVMM7e/YiK0sKO6S6/lEpHXyEzoi35x6du47N73PnQ58?= =?us-ascii?Q?y1e/VF++rGD2dKQ2Iim3tlLy?= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 68781008-2f9f-4e0c-e8f4-08d93d573fb0 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 12:45:19.0632 (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: FYmF3r9gbDm9yg8Z6vQAznkBtMyDfyvV00Dk2UXnEqil0JDBndchScIIKgqjciYUmyu1vpjN52SrbV/aw3dMcDJZPZQvUZ5ADZ/TW+tn8Xs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB3990 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 wdt_start() does the "no ->start? return -ENOSYS" check, don't open-code that in wdt_expire_now(). Also, wdt_start() maintains some global (and later some per-device) state, which would get out of sync with this direct method call - not that it matters much here since the board is supposed to reset very soon. Reviewed-by: Simon Glass Reviewed-by: Stefan Roese Signed-off-by: Rasmus Villemoes --- drivers/watchdog/wdt-uclass.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 2687135296..634428fa24 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -118,10 +118,8 @@ int wdt_expire_now(struct udevice *dev, ulong flags) if (ops->expire_now) { return ops->expire_now(dev, flags); } else { - if (!ops->start) - return -ENOSYS; + ret = wdt_start(dev, 1, flags); - ret = ops->start(dev, 1, flags); if (ret < 0) return ret; -- 2.31.1