From patchwork Wed Jan 11 02:09:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9509073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9882D6075C for ; Wed, 11 Jan 2017 02:09:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82BD3285C8 for ; Wed, 11 Jan 2017 02:09:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75A17285D0; Wed, 11 Jan 2017 02:09:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D99F92833F for ; Wed, 11 Jan 2017 02:09:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cR8MK-0001rR-6b; Wed, 11 Jan 2017 02:09:52 +0000 Received: from bh-25.webhostbox.net ([208.91.199.152]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cR8MG-0001jh-PK for linux-arm-kernel@lists.infradead.org; Wed, 11 Jan 2017 02:09:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From; bh=BafopHDhYimdjvJna05m2ND9xBSNobRU80+PijB7j7g=; b=mEX3uf2miHePZT fhpKAP+EzEDIryXmCAWLt1x6OHGINdvrM9GOB9i/esHTGRwmyUPkODDmicUFIw2fW6sO0EsovhL5b cOvmxLZQiUieEt+gD0+t8M77PvoZouDzrczYyg/O7vA2qud5k/BSF8cSpXadJ+2bka37VlXZDa+YY ECIBBE5ahKIAQ9vylrGSjNsBCLBUBoJ2anwkfJ54EjRHNkrhm0Kat5LjI0ZnEgz8R/osF0+EJsCxt jHCaAlkjm0gT7dg5cgPSO3j+MDRNiebY3LP6sxnCaRMVC3tc4mORVUgED8o0s9rXMbcluqprhw6/7 QvgY6sen3pR4uRQ7vG2Q==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:42278 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1cR8Lr-001Ov5-Ee; Wed, 11 Jan 2017 02:09:23 +0000 From: Guenter Roeck To: Wim Van Sebroeck Subject: [PATCH 52/62] watchdog: sirfsoc_wdt: Convert to use device managed functions and other improvements Date: Tue, 10 Jan 2017 18:09:06 -0800 Message-Id: <1484100561-17638-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484091325-9199-1-git-send-email-linux@roeck-us.net> References: <1484091325-9199-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 - lists.infradead.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: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170110_180948_908437_CEAFA343 X-CRM114-Status: UNSURE ( 9.62 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Barry Song , linux-watchdog@vger.kernel.org, Guenter Roeck , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 - Use devm_watchdog_register_driver() to register watchdog device - Replace shutdown function with call to watchdog_stop_on_reboot() Cc: Barry Song Signed-off-by: Guenter Roeck --- drivers/watchdog/sirfsoc_wdt.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c index 3050a0031479..fb88e04d18ae 100644 --- a/drivers/watchdog/sirfsoc_wdt.c +++ b/drivers/watchdog/sirfsoc_wdt.c @@ -161,7 +161,8 @@ static int sirfsoc_wdt_probe(struct platform_device *pdev) watchdog_set_nowayout(&sirfsoc_wdd, nowayout); sirfsoc_wdd.parent = &pdev->dev; - ret = watchdog_register_device(&sirfsoc_wdd); + watchdog_stop_on_reboot(&sirfsoc_wdd); + ret = devm_watchdog_register_device(&pdev->dev, &sirfsoc_wdd); if (ret) return ret; @@ -170,16 +171,9 @@ static int sirfsoc_wdt_probe(struct platform_device *pdev) return 0; } -static void sirfsoc_wdt_shutdown(struct platform_device *pdev) -{ - struct watchdog_device *wdd = platform_get_drvdata(pdev); - - sirfsoc_wdt_disable(wdd); -} - static int sirfsoc_wdt_remove(struct platform_device *pdev) { - sirfsoc_wdt_shutdown(pdev); + sirfsoc_wdt_disable(platform_get_drvdata(pdev)); return 0; } @@ -221,7 +215,6 @@ static struct platform_driver sirfsoc_wdt_driver = { }, .probe = sirfsoc_wdt_probe, .remove = sirfsoc_wdt_remove, - .shutdown = sirfsoc_wdt_shutdown, }; module_platform_driver(sirfsoc_wdt_driver);