Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3633836pxb; Sat, 13 Feb 2021 04:22:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAWOL+DpvilIucw71DZGd3brEN+2Wkj0xHtRI7NToKS9qzN36ci4uA7J1BI3voIR9ItK5Y X-Received: by 2002:a05:6402:5112:: with SMTP id m18mr7685412edd.129.1613218958480; Sat, 13 Feb 2021 04:22:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613218958; cv=none; d=google.com; s=arc-20160816; b=Gw1AJ6PnGEUBkRLCc0Ihi2GTzOd1mGzy8x3D2h7HYIRWEpjhEkOq7CflwreWQXPvUZ 2tTHeNWgYciT2boLcmM2fOVgVCvy1ZGO4N8RrqljT7440uneGi8c7704EJtGwjuVdB1a 8lvFUPUtLheeujqaXdRPYmr7eWwpcLHNFu110cvlk/WFbuQMwFiGPk8owWeiSPFuXdd1 IvGGeErMJeBtjgg3cMxC12VxMHr/ODK+2Lv6gbLmwb3i48SwwKgzjrxtkIToDt6KLU3N Kx1uSUdUxDWQPbmLakeXoqYQoTxHrb/Zh0f7QRpQAZHxu+69rdU7iId2bL0r3BicbfbJ fNAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=WcoOJgJsCus9j+z1oc3UJY2GBbxvXHxxloSoBiuOvOQ=; b=tQGYAXTWvYF2tsLRh69klgzfYyiSeS0ybRQjrmSEcQtk1vX9j7FqSZk4GrUMd7MHdt WSgL1f3GDN5a4YX3nzSSeuxz55u85szQmpWdkcJuZP91d3VXoVhPfzpUP7hujAypjmCS aXy1UMLbpqgubyOsU581s5ZTtKDplCvfa83562x74XU+6fpq1shvkiFanmMg0/8hXwS5 tfTl1Iak6dThy6c83S3/hxBN83dhJHtNPpNpXZvPI4Pbb+EkyXVqaVWfPeyX7O6E7Hee f+u1tatKFiStJTSAWM+MWdUOuTuDVSG2YUgb6w+8l+yahnum88UiLjr9IhpiljePn/TK vw9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 16si8313700ejz.31.2021.02.13.04.22.15; Sat, 13 Feb 2021 04:22:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbhBMMTm (ORCPT + 99 others); Sat, 13 Feb 2021 07:19:42 -0500 Received: from mail-lf1-f41.google.com ([209.85.167.41]:41776 "EHLO mail-lf1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhBMMTi (ORCPT ); Sat, 13 Feb 2021 07:19:38 -0500 Received: by mail-lf1-f41.google.com with SMTP id d24so3313555lfs.8; Sat, 13 Feb 2021 04:19:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=WcoOJgJsCus9j+z1oc3UJY2GBbxvXHxxloSoBiuOvOQ=; b=ALyUcmchCotpVZiWEHetCgW5V8s/vFLxzeI19cBzEuhGO1K9G0x47C4RcfUQ3Ks5Ga L5lHrS6B8BkxdixZBJcfkEku4Ccnx7C6pOfBqr1UHnpL/naYiVI3H34eUKb3rv5CyDW+ IdtXu8tfy9Gm5rc7H5iuYJpw0coU2kJVyLhhAiwZnKIGSIhFHCkHdsEgH2kk2kR4Glea ygGrl+/9S5yTdvfJV/m4EjQY0rZTeq0Q8dFPIoEIBG/r8mZTjCbYiGCW/kRqJ5tV/1aX vUbudVwdY9xzwD4fv1NHC08Cn0HhU9Fo/V4GMzPJu8RbCdnMvJviDyXfbGGA/3vjRBkv JSLg== X-Gm-Message-State: AOAM5333NjPkPT5UE5MAiVV4YSexGoQ1aln5vtNyq02Wrl/oY7O41Eec wHfzelKjSTPo4qOpLuy2od6yOTLZIWtsOg== X-Received: by 2002:a05:6512:1094:: with SMTP id j20mr4105261lfg.442.1613218735504; Sat, 13 Feb 2021 04:18:55 -0800 (PST) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id z8sm1330907lfr.124.2021.02.13.04.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 04:18:55 -0800 (PST) Date: Sat, 13 Feb 2021 14:18:48 +0200 From: Matti Vaittinen To: mazziesaccount@gmail.com, matti.vaittinen@fi.rohmeurope.com Cc: Greg Kroah-Hartman , Guenter Roeck , Wim Van Sebroeck , linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC PATCH 7/7] watchdog: retu_wdt: Clean-up by using managed work init Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Few drivers implement remove call-back only for ensuring a delayed work gets cancelled prior driver removal. Clean-up these by switching to use devm_delayed_work_autocancel() instead. This change is compile-tested only. All testing is appreciated. Signed-off-by: Matti Vaittinen --- drivers/watchdog/retu_wdt.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c index 258dfcf9cbda..3b65bdaf54b4 100644 --- a/drivers/watchdog/retu_wdt.c +++ b/drivers/watchdog/retu_wdt.c @@ -127,9 +127,12 @@ static int retu_wdt_probe(struct platform_device *pdev) wdev->rdev = rdev; wdev->dev = &pdev->dev; - INIT_DELAYED_WORK(&wdev->ping_work, retu_wdt_ping_work); + ret = devm_delayed_work_autocancel(&pdev->dev, &wdev->ping_work, + retu_wdt_ping_work); + if (ret) + return ret; - ret = watchdog_register_device(retu_wdt); + ret = devm_watchdog_register_device(&pdev->dev, retu_wdt); if (ret < 0) return ret; @@ -138,25 +141,11 @@ static int retu_wdt_probe(struct platform_device *pdev) else retu_wdt_ping_enable(wdev); - platform_set_drvdata(pdev, retu_wdt); - - return 0; -} - -static int retu_wdt_remove(struct platform_device *pdev) -{ - struct watchdog_device *wdog = platform_get_drvdata(pdev); - struct retu_wdt_dev *wdev = watchdog_get_drvdata(wdog); - - watchdog_unregister_device(wdog); - cancel_delayed_work_sync(&wdev->ping_work); - return 0; } static struct platform_driver retu_wdt_driver = { .probe = retu_wdt_probe, - .remove = retu_wdt_remove, .driver = { .name = "retu-wdt", }, -- 2.25.4 -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ Thanks to Simon Glass for the translation =]