From patchwork Sat Feb 13 11:58:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 382623 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 3F26FC433E6 for ; Sat, 13 Feb 2021 12:00:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04B5164E46 for ; Sat, 13 Feb 2021 12:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbhBML7p (ORCPT ); Sat, 13 Feb 2021 06:59:45 -0500 Received: from mail-lj1-f181.google.com ([209.85.208.181]:41921 "EHLO mail-lj1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229706AbhBML7g (ORCPT ); Sat, 13 Feb 2021 06:59:36 -0500 Received: by mail-lj1-f181.google.com with SMTP id e17so2145556ljl.8; Sat, 13 Feb 2021 03:59:19 -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=Og3EKyxPUKMGfzz8yqu0JBwP+v96RpWUBQsEZbrHD+8=; b=inRjugq8dZYlJ6CKvLuFRZuygDwWgg/eI1qK0UtvZC5aXeTHWXAZnh4CmXIvaUpdET RZbmyLvO2Jgjrc8l/m7pxQ6AQfapVpdoTDVR72Z3a3f2BFyr5+VCS57NzbTlVjVIKga6 PWwfLi6Ytk0GX9K3QgfsxOUXNqecAQaYp8Ri+Z0dNzn9zCQd5KJ9+TTG7fZ973FNzx6k d/hPzIS96BCawHPV9lkFNxvvqKXl7tnRfA12eivyl0Zn56uwyCHdacF0JNqDawGw395+ X3reRIZlP3l4ffScErusYdied3SeyAqU1qQEBxYPIsBUMPKUkViW4qjtO8v51+ZvPj2l vIHg== X-Gm-Message-State: AOAM5311BlORlGJ4wtfdqkHqgDcrgZjlZFL437zEnwtxdQcCWfr5k3Je sarltkWfCO+KaWsm9Jx+z1g= X-Google-Smtp-Source: ABdhPJxj3xe2a6po48BGrT8aKajunBGOzOMxU/3dhpzzTPYFHT/e8seZG86Yo2/QJ4xnTqfESId53w== X-Received: by 2002:a2e:7a18:: with SMTP id v24mr4030132ljc.55.1613217533531; Sat, 13 Feb 2021 03:58:53 -0800 (PST) Received: from localhost.localdomain (dc7vkhyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::4]) by smtp.gmail.com with ESMTPSA id v72sm1838780lfa.77.2021.02.13.03.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 03:58:52 -0800 (PST) Date: Sat, 13 Feb 2021 13:58:44 +0200 From: Matti Vaittinen To: mazziesaccount@gmail.com, matti.vaittinen@fi.rohmeurope.com Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , MyungJoo Ham , Chanwoo Choi , Andy Gross , Bjorn Andersson , Jean Delvare , Guenter Roeck , Hans de Goede , Mark Gross , Sebastian Reichel , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Wim Van Sebroeck , Saravana Kannan , Heikki Krogerus , Andy Shevchenko , Joerg Roedel , Dan Williams , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-hwmon@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC PATCH 1/7] drivers: base: Add resource managed version of delayed work init Message-ID: <1230b0d2ba99ad546d72ab079e76cb1b3df32afb.1613216412.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org A few drivers which need a delayed work-queue must cancel work at exit. Some of those implement remove solely for this purpose. Help drivers to avoid unnecessary remove and error-branch implementation by adding managed verision of delayed work initialization Signed-off-by: Matti Vaittinen --- drivers/base/devres.c | 33 +++++++++++++++++++++++++++++++++ include/linux/device.h | 5 +++++ 2 files changed, 38 insertions(+) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index fb9d5289a620..2879595bb5a4 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -1231,3 +1231,36 @@ void devm_free_percpu(struct device *dev, void __percpu *pdata) (void *)pdata)); } EXPORT_SYMBOL_GPL(devm_free_percpu); + +static void dev_delayed_work_drop(struct device *dev, void *res) +{ + cancel_delayed_work_sync(*(struct delayed_work **)res); +} + +/** + * devm_delayed_work_autocancel - Resource-managed work allocation + * @dev: Device which lifetime work is bound to + * @pdata: work to be cancelled when device exits + * + * Initialize work which is automatically cancelled when device exits. + * A few drivers need delayed work which must be cancelled before driver + * is unload to avoid accessing removed resources. + * devm_delayed_work_autocancel() can be used to omit the explicit + * cancelleation when driver is unload. + */ +int devm_delayed_work_autocancel(struct device *dev, struct delayed_work *w, + void (*worker)(struct work_struct *work)) +{ + struct delayed_work **ptr; + + ptr = devres_alloc(dev_delayed_work_drop, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + INIT_DELAYED_WORK(w, worker); + *ptr = w; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_delayed_work_autocancel); diff --git a/include/linux/device.h b/include/linux/device.h index 1779f90eeb4c..192456198de7 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -249,6 +250,10 @@ void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index, resource_size_t *size); +/* delayed work which is cancelled when driver exits */ +int devm_delayed_work_autocancel(struct device *dev, struct delayed_work *w, + void (*worker)(struct work_struct *work)); + /* allows to add/remove a custom action to devres stack */ int devm_add_action(struct device *dev, void (*action)(void *), void *data); void devm_remove_action(struct device *dev, void (*action)(void *), void *data); From patchwork Sat Feb 13 12:18:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 382622 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS 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 42012C433DB for ; Sat, 13 Feb 2021 12:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CDEA64E46 for ; Sat, 13 Feb 2021 12:19:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229617AbhBMMTl (ORCPT ); Sat, 13 Feb 2021 07:19:41 -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-Google-Smtp-Source: ABdhPJyzMxI8YixWXUsIVFeJM31vUFpyRSqjH+GUJFxCARCLS7L5vpJN4Y7JSBaPCVH30CtVdV9WBw== 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-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@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", },