From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761591AbdAKFTO (ORCPT ); Wed, 11 Jan 2017 00:19:14 -0500 Received: from mail-vk0-f66.google.com ([209.85.213.66]:33634 "EHLO mail-vk0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761559AbdAKFTM (ORCPT ); Wed, 11 Jan 2017 00:19:12 -0500 MIME-Version: 1.0 In-Reply-To: <1484091325-9199-3-git-send-email-linux@roeck-us.net> References: <1484091325-9199-1-git-send-email-linux@roeck-us.net> <1484091325-9199-3-git-send-email-linux@roeck-us.net> From: Joel Stanley Date: Wed, 11 Jan 2017 16:18:50 +1100 X-Google-Sender-Auth: i9T5nAu5NIC-18RDTbJL-csV27E Message-ID: Subject: Re: [PATCH 02/62] watchdog: aspeed_wdt: Convert to use device managed functions To: Guenter Roeck Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 11, 2017 at 10:34 AM, Guenter Roeck wrote: > Use device managed functions to simplify error handling, reduce > source code size, improve readability, and reduce the likelyhood of bugs. > > 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 assignments to otherwise unused variables > - Drop remove function > - Drop platform_set_drvdata() > - Use devm_watchdog_register_driver() to register watchdog device > > Cc: Joel Stanley > Signed-off-by: Guenter Roeck Acked-by: Joel Stanley Cheers, Joel > --- > drivers/watchdog/aspeed_wdt.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c > index f5ad8023c2e6..1c652582de40 100644 > --- a/drivers/watchdog/aspeed_wdt.c > +++ b/drivers/watchdog/aspeed_wdt.c > @@ -136,15 +136,6 @@ static const struct watchdog_info aspeed_wdt_info = { > .identity = KBUILD_MODNAME, > }; > > -static int aspeed_wdt_remove(struct platform_device *pdev) > -{ > - struct aspeed_wdt *wdt = platform_get_drvdata(pdev); > - > - watchdog_unregister_device(&wdt->wdd); > - > - return 0; > -} > - > static int aspeed_wdt_probe(struct platform_device *pdev) > { > struct aspeed_wdt *wdt; > @@ -187,20 +178,17 @@ static int aspeed_wdt_probe(struct platform_device *pdev) > set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); > } > > - ret = watchdog_register_device(&wdt->wdd); > + ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdd); > if (ret) { > dev_err(&pdev->dev, "failed to register\n"); > return ret; > } > > - platform_set_drvdata(pdev, wdt); > - > return 0; > } > > static struct platform_driver aspeed_watchdog_driver = { > .probe = aspeed_wdt_probe, > - .remove = aspeed_wdt_remove, > .driver = { > .name = KBUILD_MODNAME, > .of_match_table = of_match_ptr(aspeed_wdt_of_table), > -- > 2.7.4 >