net/mlx5e: Move mlx5e_rq struct declaration

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

diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 8377c43f3f20ff0c7537642b05ac580badffdd71..50bdd10221864994a771b868acd98c07fc398528 100644 (file)
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -108,7 +108,7 @@ static int da9055_wdt_stop(struct watchdog_device *wdt_dev)
        return da9055_wdt_set_timeout(wdt_dev, 0);
 }
 
-static struct watchdog_info da9055_wdt_info = {
+static const struct watchdog_info da9055_wdt_info = {
        .options        = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
        .identity       = "DA9055 Watchdog",
 };
@@ -147,32 +147,19 @@ static int da9055_wdt_probe(struct platform_device *pdev)
        ret = da9055_wdt_stop(da9055_wdt);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to stop watchdog, %d\n", ret);
-               goto err;
+               return ret;
        }
 
-       platform_set_drvdata(pdev, driver_data);
-
-       ret = watchdog_register_device(&driver_data->wdt);
+       ret = devm_watchdog_register_device(&pdev->dev, &driver_data->wdt);
        if (ret != 0)
                dev_err(da9055->dev, "watchdog_register_device() failed: %d\n",
                        ret);
 
-err:
        return ret;
 }
 
-static int da9055_wdt_remove(struct platform_device *pdev)
-{
-       struct da9055_wdt_data *driver_data = platform_get_drvdata(pdev);
-
-       watchdog_unregister_device(&driver_data->wdt);
-
-       return 0;
-}
-
 static struct platform_driver da9055_wdt_driver = {
        .probe = da9055_wdt_probe,
-       .remove = da9055_wdt_remove,
        .driver = {
                .name   = "da9055-watchdog",
        },