diff mbox

[U-Boot] dm: Update Simple Watchdog uclass

Message ID 1494335381-3531-1-git-send-email-trini@konsulko.com
State Accepted
Commit 78df5e1ed0b6bf6919339d625abccea405d29167
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini May 9, 2017, 1:09 p.m. UTC 
From: Maxim Sloyko <maxims@google.com>

- 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>
---
 drivers/watchdog/sandbox_wdt.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Comments

Tom Rini May 9, 2017, 1:11 p.m. UTC | #1 
On Tue, May 09, 2017 at 09:09:41AM -0400, Tom Rini wrote:

> From: Maxim Sloyko <maxims@google.com>
> 
> - 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c
index 34d90bee7e8f..02b57f39865c 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,
 };