From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:36909 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbbKCC2p (ORCPT ); Mon, 2 Nov 2015 21:28:45 -0500 Subject: Re: [RFC PATCH 05/13] watchdog: imgpdc_wdt: use core restart handler To: Damien Riegel , linux-watchdog@vger.kernel.org References: <1446514586-31455-1-git-send-email-damien.riegel@savoirfairelinux.com> <1446514586-31455-6-git-send-email-damien.riegel@savoirfairelinux.com> Cc: Wim Van Sebroeck , Vivien Didelot , kernel@savoirfairelinux.com From: Guenter Roeck Message-ID: <56381BDB.7030209@roeck-us.net> Date: Mon, 2 Nov 2015 18:28:43 -0800 MIME-Version: 1.0 In-Reply-To: <1446514586-31455-6-git-send-email-damien.riegel@savoirfairelinux.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On 11/02/2015 05:36 PM, Damien Riegel wrote: > Get rid of the custom restart handler by using the one provided by the > watchdog core. > > Signed-off-by: Damien Riegel > Signed-off-by: Vivien Didelot Reviewed-by: Guenter Roeck > --- > drivers/watchdog/imgpdc_wdt.c | 34 ++++++++++++---------------------- > 1 file changed, 12 insertions(+), 22 deletions(-) > > diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c > index 15ab072..3679f2e 100644 > --- a/drivers/watchdog/imgpdc_wdt.c > +++ b/drivers/watchdog/imgpdc_wdt.c > @@ -45,7 +45,6 @@ > #include > #include > #include > -#include > #include > #include > > @@ -87,7 +86,6 @@ struct pdc_wdt_dev { > struct clk *wdt_clk; > struct clk *sys_clk; > void __iomem *base; > - struct notifier_block restart_handler; > }; > > static int pdc_wdt_keepalive(struct watchdog_device *wdt_dev) > @@ -152,6 +150,16 @@ static int pdc_wdt_start(struct watchdog_device *wdt_dev) > return 0; > } > > +static int pdc_wdt_restart(struct watchdog_device *wdt_dev) > +{ > + struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev); > + > + /* Assert SOFT_RESET */ > + writel(0x1, wdt->base + PDC_WDT_SOFT_RESET); > + > + return 0; > +} > + > static struct watchdog_info pdc_wdt_info = { > .identity = "IMG PDC Watchdog", > .options = WDIOF_SETTIMEOUT | > @@ -165,20 +173,9 @@ static const struct watchdog_ops pdc_wdt_ops = { > .stop = pdc_wdt_stop, > .ping = pdc_wdt_keepalive, > .set_timeout = pdc_wdt_set_timeout, > + .restart = pdc_wdt_restart, > }; > > -static int pdc_wdt_restart(struct notifier_block *this, unsigned long mode, > - void *cmd) > -{ > - struct pdc_wdt_dev *wdt = container_of(this, struct pdc_wdt_dev, > - restart_handler); > - > - /* Assert SOFT_RESET */ > - writel(0x1, wdt->base + PDC_WDT_SOFT_RESET); > - > - return NOTIFY_OK; > -} > - > static int pdc_wdt_probe(struct platform_device *pdev) > { > u64 div; > @@ -282,6 +279,7 @@ static int pdc_wdt_probe(struct platform_device *pdev) > } > > watchdog_set_nowayout(&pdc_wdt->wdt_dev, nowayout); > + watchdog_set_restart_priority(&pdc_wdt->wdt_dev, 128); > > platform_set_drvdata(pdev, pdc_wdt); > > @@ -289,13 +287,6 @@ static int pdc_wdt_probe(struct platform_device *pdev) > if (ret) > goto disable_wdt_clk; > > - pdc_wdt->restart_handler.notifier_call = pdc_wdt_restart; > - pdc_wdt->restart_handler.priority = 128; > - ret = register_restart_handler(&pdc_wdt->restart_handler); > - if (ret) > - dev_warn(&pdev->dev, "failed to register restart handler: %d\n", > - ret); > - > return 0; > > disable_wdt_clk: > @@ -316,7 +307,6 @@ static int pdc_wdt_remove(struct platform_device *pdev) > { > struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev); > > - unregister_restart_handler(&pdc_wdt->restart_handler); > pdc_wdt_stop(&pdc_wdt->wdt_dev); > watchdog_unregister_device(&pdc_wdt->wdt_dev); > clk_disable_unprepare(pdc_wdt->wdt_clk); >