lkml.org 
[lkml]   [2017]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] watchdog: tangox: Use watchdog core to install restart handler
    Date
    Use the infrastructure provided by the watchdog core to install
    the restart handler.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    ---
    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 <linux/kernel.h>
    #include <linux/module.h>
    #include <linux/moduleparam.h>
    -#include <linux/notifier.h>
    #include <linux/platform_device.h>
    -#include <linux/reboot.h>
    #include <linux/watchdog.h>

    #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;
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-01-04 22:31    [W:3.918 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site