summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-10-03 11:46:30 +0200
committerWim Van Sebroeck <wim@iguana.be>2013-11-17 19:37:31 +0100
commitb1f9cd3225ae2e8626fe7503ae7be92240873049 (patch)
treeca9d88cd4bd320c953ed04b449b3556cadb8d332 /drivers/watchdog
parentwatchdog: sirf: add watchdog driver of CSR SiRFprimaII and SiRFatlasVI (diff)
downloadlinux-b1f9cd3225ae2e8626fe7503ae7be92240873049.tar.xz
linux-b1f9cd3225ae2e8626fe7503ae7be92240873049.zip
watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()
Driver core clears the driver data to NULL after device_release or on probe failure, so just remove it from here. Driver core change: "device-core: Ensure drvdata = NULL when no driver is bound" (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d) Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/sp805_wdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 58df98aec122..3f786ce0a6f2 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -268,7 +268,6 @@ static int sp805_wdt_remove(struct amba_device *adev)
struct sp805_wdt *wdt = amba_get_drvdata(adev);
watchdog_unregister_device(&wdt->wdd);
- amba_set_drvdata(adev, NULL);
watchdog_set_drvdata(&wdt->wdd, NULL);
return 0;