summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-08-25 16:11:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-08-26 12:54:32 +0200
commit167e93947e9b755b54900ae9870dbcc089f8d6c9 (patch)
tree00ce93b83fd67b9ff1d515e822f444220978e79d /drivers/watchdog
parentc170240d3e5fb5cd134790dfc0c6e474fc0e6706 (diff)
downloadbarebox-167e93947e9b755b54900ae9870dbcc089f8d6c9.tar.gz
watchdog: imxwd: remove remove callback
The imxwd is for resetting the system, so we should not unregister it during shutdown_barebox() as it may leave us without a restart handler. Only a bug (not setting reset_wd to NULL in remove()) made the whole thing work. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/imxwd.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index 5ffbac7..9f09f6e 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -217,17 +217,6 @@ on_error:
return ret;
}
-static void imx_wd_remove(struct device_d *dev)
-{
- struct imx_wd *priv = dev->priv;
-
- if (IS_ENABLED(CONFIG_WATCHDOG_IMX))
- watchdog_deregister(&priv->wd);
-
- if (reset_wd && reset_wd != priv)
- free(priv);
-}
-
static const struct imx_wd_ops imx21_wd_ops = {
.set_timeout = imx21_watchdog_set_timeout,
.init = imx21_wd_init,
@@ -264,7 +253,6 @@ static struct platform_device_id imx_wdt_ids[] = {
static struct driver_d imx_wd_driver = {
.name = "imx-watchdog",
.probe = imx_wd_probe,
- .remove = imx_wd_remove,
.of_compatible = DRV_OF_COMPAT(imx_wdt_dt_ids),
.id_table = imx_wdt_ids,
};