From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161145AbdAEJmn (ORCPT ); Thu, 5 Jan 2017 04:42:43 -0500 Received: from mail1.bemta8.messagelabs.com ([216.82.243.200]:15618 "EHLO mail1.bemta8.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031496AbdAEJm1 (ORCPT ); Thu, 5 Jan 2017 04:42:27 -0500 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRWlGSWpSXmKPExsVy+LrFKt3/Ink RBsfeKVhsenyN1eLyrjlsFjfW7WO3eLLwDJPFj4fTmSxuzXjB6sDmcW2zmMfmJfUeb06fYvfY +b2B3ePzJrkA1ijWzLyk/IoE1owLMxaxFlwVq1j56yBTA2ODcBcjF4eQwFJGiYMfrrN2MXJyC AtESGyb0s8CYosIuElcXvSHHaSIWaCfUeLFxWdgCSGBKomGy51sIDabgInEzfvnwOK8As4SG3 v/gsVZBFQkXk/ZzAhiiwokSKw4N4cJokZQ4uTMJ2D1nED1q54eZwaxmQX0JKZcbWGEsAUllrx eA2XLS2x/O4cZYq+2xPuNi8EOlRBQkJg6uZV5AqPALCRjZyEZNQvJqFlIRi1gZFnFqF6cWlSW WqRrqZdUlJmeUZKbmJmja2hgoZebWlycmJ6ak5hUrJecn7uJERgLDECwg3HdVOdDjJIcTEqiv NbfciOE+JLyUyozEosz4otKc1KLDzHKcHAoSfAKAmNLSLAoNT21Ii0zBxiVMGkJDh4lEd5MYa A0b3FBYm5xZjpE6hSjopQ4rwhInwBIIqM0D64NlgguMcpKCfMyAh0ixFOQWpSbWYIq/4pRnIN RSZj3Ich4nsy8Erjpr4AWMwEt3h6QDbK4JBEhJdXAKPFdMVfky9cr39uM5nxUFeYvaJylH8Og dOlH0tvN0i6+fRaTtq497pYpP2X+0312IpckZqivPFok5Cc9j9NMqv9B6uY1c2b4CV+TZlB/w B/Ivm8y747/lleD4qtnVr2r/hDCW8TUdTzhEVfDpVC7Z7Gxvfx2Ym6ZJgsfNxy/E61YoVfYdr pfiaU4I9FQi7moOBEAM4iD5/8CAAA= X-Env-Sender: Marc_Gonzalez@sigmadesigns.com X-Msg-Ref: server-15.tower-96.messagelabs.com!1483609342!56814012!1 X-Originating-IP: [195.215.56.170] X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Subject: Re: [PATCH 4/4] watchdog: tangox: Use watchdog core to install restart handler To: Guenter Roeck , Mans Rullgard CC: Wim Van Sebroeck , , , References: <1483565318-25578-1-git-send-email-linux@roeck-us.net> <1483565318-25578-4-git-send-email-linux@roeck-us.net> From: Marc Gonzalez Message-ID: Date: Thu, 5 Jan 2017 10:42:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Firefox/50.0 SeaMonkey/2.47 MIME-Version: 1.0 In-Reply-To: <1483565318-25578-4-git-send-email-linux@roeck-us.net> Content-Type: text/plain; charset="ISO-8859-1" Content-Language: Content-Transfer-Encoding: 7bit X-Originating-IP: [172.27.0.114] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Adding Mans ] Guenter, patch c7ef68c32265 states "Fixes: a3e376d26ace". Is that true? I mean, they seem quite orthogonal; then again I know nothing of this framework. Regards. On 04/01/2017 22:28, Guenter Roeck wrote: > Use the infrastructure provided by the watchdog core to install > the restart handler. > > Signed-off-by: Guenter Roeck > --- > drivers/watchdog/tangox_wdt.c | 32 +++++++++++--------------------- > 1 file changed, 11 insertions(+), 21 deletions(-) > > diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c > index 202c4b9cc921..49e6e805db7c 100644 > --- a/drivers/watchdog/tangox_wdt.c > +++ b/drivers/watchdog/tangox_wdt.c > @@ -15,9 +15,7 @@ > #include > #include > #include > -#include > #include > -#include > #include > > #define DEFAULT_TIMEOUT 30 > @@ -47,7 +45,6 @@ struct tangox_wdt_device { > void __iomem *base; > unsigned long clk_rate; > struct clk *clk; > - struct notifier_block restart; > }; > > static int tangox_wdt_set_timeout(struct watchdog_device *wdt, > @@ -96,24 +93,24 @@ static const struct watchdog_info tangox_wdt_info = { > .identity = "tangox watchdog", > }; > > +static int tangox_wdt_restart(struct watchdog_device *wdt, > + unsigned long action, void *data) > +{ > + struct tangox_wdt_device *dev = watchdog_get_drvdata(wdt); > + > + writel(1, dev->base + WD_COUNTER); > + > + return 0; > +} > + > static const struct watchdog_ops tangox_wdt_ops = { > .start = tangox_wdt_start, > .stop = tangox_wdt_stop, > .set_timeout = tangox_wdt_set_timeout, > .get_timeleft = tangox_wdt_get_timeleft, > + .restart = tangox_wdt_restart, > }; > > -static int tangox_wdt_restart(struct notifier_block *nb, unsigned long action, > - void *data) > -{ > - struct tangox_wdt_device *dev = > - container_of(nb, struct tangox_wdt_device, restart); > - > - writel(1, dev->base + WD_COUNTER); > - > - return NOTIFY_DONE; > -} > - > static int tangox_wdt_probe(struct platform_device *pdev) > { > struct tangox_wdt_device *dev; > @@ -180,12 +177,6 @@ static int tangox_wdt_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, dev); > > - dev->restart.notifier_call = tangox_wdt_restart; > - dev->restart.priority = 128; > - err = register_restart_handler(&dev->restart); > - if (err) > - dev_warn(&pdev->dev, "failed to register restart handler\n"); > - > dev_info(&pdev->dev, "SMP86xx/SMP87xx watchdog registered\n"); > > return 0; > @@ -202,7 +193,6 @@ static int tangox_wdt_remove(struct platform_device *pdev) > tangox_wdt_stop(&dev->wdt); > clk_disable_unprepare(dev->clk); > > - unregister_restart_handler(&dev->restart); > watchdog_unregister_device(&dev->wdt); > > return 0; >