From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934822AbdAKAqE (ORCPT ); Tue, 10 Jan 2017 19:46:04 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:41563 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933382AbdAKAp7 (ORCPT ); Tue, 10 Jan 2017 19:45:59 -0500 From: Guenter Roeck To: Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Matthias Brugger Subject: [PATCH 36/62] watchdog: mt7621_wdt: Convert to use device managed functions and other improvements Date: Tue, 10 Jan 2017 16:44:45 -0800 Message-Id: <1484095516-12720-6-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484095516-12720-1-git-send-email-linux@roeck-us.net> References: <1484091325-9199-1-git-send-email-linux@roeck-us.net> <1484095516-12720-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use device managed functions to simplify error handling, reduce source code size, improve readability, and reduce the likelyhood of bugs. Other improvements as listed below. The conversion was done automatically with coccinelle using the following semantic patches. The semantic patches and the scripts used to generate this commit log are available at https://github.com/groeck/coccinelle-patches - Drop remove function - Use devm_watchdog_register_driver() to register watchdog device - Replace shutdown function with call to watchdog_stop_on_reboot() Cc: Matthias Brugger Signed-off-by: Guenter Roeck --- drivers/watchdog/mt7621_wdt.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index 2fb5a3085521..ba4a4e1a68e2 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -145,23 +145,12 @@ static int mt7621_wdt_probe(struct platform_device *pdev) &pdev->dev); watchdog_set_nowayout(&mt7621_wdt_dev, nowayout); - ret = watchdog_register_device(&mt7621_wdt_dev); + watchdog_stop_on_reboot(&mt7621_wdt_dev); + ret = devm_watchdog_register_device(&pdev->dev, &mt7621_wdt_dev); return 0; } -static int mt7621_wdt_remove(struct platform_device *pdev) -{ - watchdog_unregister_device(&mt7621_wdt_dev); - - return 0; -} - -static void mt7621_wdt_shutdown(struct platform_device *pdev) -{ - mt7621_wdt_stop(&mt7621_wdt_dev); -} - static const struct of_device_id mt7621_wdt_match[] = { { .compatible = "mediatek,mt7621-wdt" }, {}, @@ -170,8 +159,6 @@ MODULE_DEVICE_TABLE(of, mt7621_wdt_match); static struct platform_driver mt7621_wdt_driver = { .probe = mt7621_wdt_probe, - .remove = mt7621_wdt_remove, - .shutdown = mt7621_wdt_shutdown, .driver = { .name = KBUILD_MODNAME, .of_match_table = mt7621_wdt_match, -- 2.7.4