From: Maxim Sloyko <maxims@google.com>
Date: Tue, 9 May 2017 13:08:07 +0000 (-0400)
Subject: dm: Update Simple Watchdog uclass
X-Git-Tag: v2017.07-rc1~392
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=78df5e1ed0b6bf6919339d625abccea405d29167;p=u-boot

dm: Update Simple Watchdog uclass

- Remove "probe" function from sandbox wdt driver
- Fix include order

Fixes: 0753bc2d30d7 ("dm: Simple Watchdog uclass")
Signed-off-by: Maxim Sloyko <maxims@google.com>
[trini: Create as the delta between v1 (applied) and v2 (should have
 applied)].
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c
index 34d90bee7e..02b57f3986 100644
--- a/drivers/watchdog/sandbox_wdt.c
+++ b/drivers/watchdog/sandbox_wdt.c
@@ -6,8 +6,8 @@
 
 #include <common.h>
 #include <dm.h>
-#include <asm/state.h>
 #include <wdt.h>
+#include <asm/state.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -46,15 +46,6 @@ static int sandbox_wdt_expire_now(struct udevice *dev, ulong flags)
 	return 0;
 }
 
-static int sandbox_wdt_probe(struct udevice *dev)
-{
-	struct sandbox_state *state = state_get_current();
-
-	memset(&state->wdt, 0, sizeof(state->wdt));
-
-	return 0;
-}
-
 static const struct wdt_ops sandbox_wdt_ops = {
 	.start = sandbox_wdt_start,
 	.reset = sandbox_wdt_reset,
@@ -72,5 +63,4 @@ U_BOOT_DRIVER(wdt_sandbox) = {
 	.id = UCLASS_WDT,
 	.of_match = sandbox_wdt_ids,
 	.ops = &sandbox_wdt_ops,
-	.probe = sandbox_wdt_probe,
 };