summaryrefslogtreecommitdiff
path: root/drivers/watchdog/twl4030_wdt.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-04 00:11:18 +0400
committerWim Van Sebroeck <wim@iguana.be>2013-07-11 23:10:13 +0400
commit6638f4e5e5114fcb0c9dcec05cb3e33454f4a9ac (patch)
tree3dc5e92d342bdf2381f7324646ed2d414ebdd36e /drivers/watchdog/twl4030_wdt.c
parent6697dbd27b6507c11815725ab31473ba74c49f06 (diff)
downloadlinux-6638f4e5e5114fcb0c9dcec05cb3e33454f4a9ac.tar.xz
watchdog: twl4030: Remove redundant platform_set_drvdata()
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Timo Kokkonen <timo.t.kokkonen@nokia.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/twl4030_wdt.c')
-rw-r--r--drivers/watchdog/twl4030_wdt.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 0f03106f7516..2d4535dc2676 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -90,10 +90,8 @@ static int twl4030_wdt_probe(struct platform_device *pdev)
twl4030_wdt_stop(wdt);
ret = watchdog_register_device(wdt);
- if (ret) {
- platform_set_drvdata(pdev, NULL);
+ if (ret)
return ret;
- }
return 0;
}
@@ -103,7 +101,6 @@ static int twl4030_wdt_remove(struct platform_device *pdev)
struct watchdog_device *wdt = platform_get_drvdata(pdev);
watchdog_unregister_device(wdt);
- platform_set_drvdata(pdev, NULL);
return 0;
}