From patchwork Tue Mar 7 07:04:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13162998 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A27FC678D5 for ; Tue, 7 Mar 2023 08:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229527AbjCGIR4 (ORCPT ); Tue, 7 Mar 2023 03:17:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230060AbjCGIRp (ORCPT ); Tue, 7 Mar 2023 03:17:45 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57E714FF0C for ; Tue, 7 Mar 2023 00:17:29 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZSVj-0003g3-93; Tue, 07 Mar 2023 09:17:27 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZRMs-002Q8H-04; Tue, 07 Mar 2023 08:04:14 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZRMr-002uFs-Bk; Tue, 07 Mar 2023 08:04:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 1/3] watchdog: bcm47xx: Simplify using devm_watchdog_register_device() Date: Tue, 7 Mar 2023 08:04:02 +0100 Message-Id: <20230307070404.2256308-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> References: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1447; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=ipYgmb1DRXfHJgb5NnRHQkT4QBz7D3v0/zcqTIsfBFc=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMaSwPbzxxJOzSVvX/eHpqwdnvk+X+KTDn5Uy//dbic128 y0mqQg7dTIaszAwcjHIiimy1BVpiU2QWPPfrmQJN8wgViaQKQxcnAIwEWk1DoZGvohAj+Z8e2ae xYlXejk3ne+9cCHl36l7P0pXXqwVbLyizNwQXSGn0pqe2M8efMXlNIdDXrKUMufEVucJKdPaUk9 I/XZ4wtEhldSzwS3to0u4kUligOCq/kcPsq6v+b9UcJnfnm9cS7WcVzFVe99Te3VGuvNv+IsK9d Iu2T8qGRmZ3nVSyt7zFzz+E3s9rOzh1biamXKvTgg8fXO/7ntgw17Z2MhrttbGZ+/EZKWlXl3K2 Z7IkOp04eOikwUX9in1r+QJ9vEOqr/q3KquKr5GT8e0/8s6sZJPfcuE3iYcMyw5xz+hI0miWYZd /UrAtZaJshmBvxT/9DxuZtnkfFRRpuzC1DMajZ5MtqEA X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-watchdog@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org This allows to drop the .remove() function as it only exists to unregister the watchdog device which is now done in a callback registered by devm_watchdog_register_device(). Signed-off-by: Uwe Kleine-König Reviewed-by: Guenter Roeck --- drivers/watchdog/bcm47xx_wdt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index 05425c1dfd4c..06a54c7de40b 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c @@ -202,7 +202,7 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) watchdog_set_restart_priority(&wdt->wdd, 64); watchdog_stop_on_reboot(&wdt->wdd); - ret = watchdog_register_device(&wdt->wdd); + ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdd); if (ret) goto err_timer; @@ -218,21 +218,11 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) return ret; } -static int bcm47xx_wdt_remove(struct platform_device *pdev) -{ - struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev); - - watchdog_unregister_device(&wdt->wdd); - - return 0; -} - static struct platform_driver bcm47xx_wdt_driver = { .driver = { .name = "bcm47xx-wdt", }, .probe = bcm47xx_wdt_probe, - .remove = bcm47xx_wdt_remove, }; module_platform_driver(bcm47xx_wdt_driver); From patchwork Tue Mar 7 07:04:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13163001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39910C678DB for ; Tue, 7 Mar 2023 08:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229874AbjCGISA (ORCPT ); Tue, 7 Mar 2023 03:18:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjCGIRy (ORCPT ); Tue, 7 Mar 2023 03:17:54 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB8964FF21 for ; Tue, 7 Mar 2023 00:17:33 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZSVi-0003g3-Dz; Tue, 07 Mar 2023 09:17:26 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZRMs-002Q8P-M5; Tue, 07 Mar 2023 08:04:14 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZRMr-002uFv-HW; Tue, 07 Mar 2023 08:04:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 2/3] watchdog: rn5t618: Simplify using devm_watchdog_register_device() Date: Tue, 7 Mar 2023 08:04:03 +0100 Message-Id: <20230307070404.2256308-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> References: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1214; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=1PxQiWm3o6xUBSctv+48rlF0I9W5WfuriSqfvHsKzlM=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkBuHcBdRQEiMdyNGO0wvyudctRxbxKNXf1ZGT8 Q5wMTuu3CyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZAbh3AAKCRDB/BR4rcrs CUlJB/9w05/G2u+xTbJgrDoPcvwy3KMVu6OelCseEE4lrsWRtsLBRj7GLxnce5iEgnNtXbgvafj 80BPCGxCQvar+kAE5RYbWyAnhV4jwawi9hcCoeI6gA5TdjfFwEhmSas+ogZITaDI6FXa+l/tC9V olLHG7+IW8Biio7sucA/WVg3d7jZmEmJ82AMgATKPHQgb575XNLn80ZX17XUCyYQSQN9hIbin0v R7mJSqJzJ/KNd9fMVZIN5kwaU9feHsT56hkNtCM3CCa2TlUnsZqwUy7dM2qpqX7N42WhL6/5VDi 15fEfkMw9yWjOz85Xhq2jYHkJQKBN3c3tZ+jvfUZR5At3m2J X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-watchdog@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org This allows to drop the .remove() function as it only exists to unregister the watchdog device which is now done in a callback registered by devm_watchdog_register_device(). Signed-off-by: Uwe Kleine-König Reviewed-by: Guenter Roeck --- drivers/watchdog/rn5t618_wdt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c index 40d8ebd8c0ac..87d06d210ac9 100644 --- a/drivers/watchdog/rn5t618_wdt.c +++ b/drivers/watchdog/rn5t618_wdt.c @@ -178,21 +178,11 @@ static int rn5t618_wdt_probe(struct platform_device *pdev) platform_set_drvdata(pdev, wdt); - return watchdog_register_device(&wdt->wdt_dev); -} - -static int rn5t618_wdt_remove(struct platform_device *pdev) -{ - struct rn5t618_wdt *wdt = platform_get_drvdata(pdev); - - watchdog_unregister_device(&wdt->wdt_dev); - - return 0; + return devm_watchdog_register_device(dev, &wdt->wdt_dev); } static struct platform_driver rn5t618_wdt_driver = { .probe = rn5t618_wdt_probe, - .remove = rn5t618_wdt_remove, .driver = { .name = DRIVER_NAME, }, From patchwork Tue Mar 7 07:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13163000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99D5DC6FD1E for ; Tue, 7 Mar 2023 08:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230120AbjCGIR6 (ORCPT ); Tue, 7 Mar 2023 03:17:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229874AbjCGIRx (ORCPT ); Tue, 7 Mar 2023 03:17:53 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CAF44FF1D for ; Tue, 7 Mar 2023 00:17:31 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZSVj-0003g3-62; Tue, 07 Mar 2023 09:17:27 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZRMs-002Q8L-Ea; Tue, 07 Mar 2023 08:04:14 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZRMr-002uFy-NM; Tue, 07 Mar 2023 08:04:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Wim Van Sebroeck , Guenter Roeck Cc: patches@opensource.cirrus.com, linux-watchdog@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 3/3] watchdog: wm8350: Simplify using devm_watchdog_register_device() Date: Tue, 7 Mar 2023 08:04:04 +0100 Message-Id: <20230307070404.2256308-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> References: <20230307070404.2256308-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1173; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=WUykWHRFf+Bdw+cJ1GYc0evQOMYyerm2g27vJVErCEs=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkBuHgjQCMx5AGmL+fbXtdjTr4N8jIcPeAJ64Jf Ez4NHJDc3uJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZAbh4AAKCRDB/BR4rcrs CUrIB/9ruGt8RcSn6jvhqDviIsXu0adrvIJllRZlxyF60DwBUUndVi+vpHSy7LFl8sTioWn1QvO LALRa/29weZCBdnTPzHFq4zGmAs9qr7yfFAAzu10e+lm/D/dzurYQ/Y5JqK/dCXKyRWgkvILcim nkuFgmuWkKQPUCH1rNJx8lHQINl/XFOtinB6/Gf3etLrjSMQNDan1N3TO+O+YhDK++Qanf8RkzZ Gl/CaC865CrJ3uy0aR/M449/aeHCjK4uMVU9f+7FQ732Am0EMuInfcC2qmjVa8vJPblACv28qMk kEOLHgfJ5TN6/uHFTdO2OVhRGsyNnwHbgImqnwJKOwFLLdf2 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-watchdog@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org This allows to drop the .remove() function as it only exists to unregister the watchdog device which is now done in a callback registered by devm_watchdog_register_device(). Signed-off-by: Uwe Kleine-König Reviewed-by: Guenter Roeck Acked-by: Charles Keepax --- drivers/watchdog/wm8350_wdt.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 33c62d51f00a..c82c1b77d91b 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -153,18 +153,11 @@ static int wm8350_wdt_probe(struct platform_device *pdev) /* Default to 4s timeout */ wm8350_wdt_set_timeout(&wm8350_wdt, 4); - return watchdog_register_device(&wm8350_wdt); -} - -static int wm8350_wdt_remove(struct platform_device *pdev) -{ - watchdog_unregister_device(&wm8350_wdt); - return 0; + return devm_watchdog_register_device(&pdev->dev, &wm8350_wdt); } static struct platform_driver wm8350_wdt_driver = { .probe = wm8350_wdt_probe, - .remove = wm8350_wdt_remove, .driver = { .name = "wm8350-wdt", },