Merge tag 'xfs-4.12-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[karo-tx-linux.git] / drivers / watchdog / da9063_wdt.c

diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c
index 5d6b4e5f7989ccc4d63a88e8b366f9b6d48b63bb..4691c5509129ec51f3df37e63b3af584a833929d 100644 (file)
--- a/drivers/watchdog/da9063_wdt.c
+++ b/drivers/watchdog/da9063_wdt.c
@@ -151,7 +151,6 @@ static const struct watchdog_ops da9063_watchdog_ops = {
 
 static int da9063_wdt_probe(struct platform_device *pdev)
 {
-       int ret;
        struct da9063 *da9063;
        struct da9063_watchdog *wdt;
 
@@ -181,27 +180,12 @@ static int da9063_wdt_probe(struct platform_device *pdev)
        watchdog_set_restart_priority(&wdt->wdtdev, 128);
 
        watchdog_set_drvdata(&wdt->wdtdev, wdt);
-       dev_set_drvdata(&pdev->dev, wdt);
-
-       ret = watchdog_register_device(&wdt->wdtdev);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static int da9063_wdt_remove(struct platform_device *pdev)
-{
-       struct da9063_watchdog *wdt = dev_get_drvdata(&pdev->dev);
-
-       watchdog_unregister_device(&wdt->wdtdev);
 
-       return 0;
+       return devm_watchdog_register_device(&pdev->dev, &wdt->wdtdev);
 }
 
 static struct platform_driver da9063_wdt_driver = {
        .probe = da9063_wdt_probe,
-       .remove = da9063_wdt_remove,
        .driver = {
                .name = DA9063_DRVNAME_WATCHDOG,
        },