]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
dm: Update Simple Watchdog uclass
authorMaxim Sloyko <maxims@google.com>
Tue, 9 May 2017 13:08:07 +0000 (09:08 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 9 May 2017 13:08:07 +0000 (09:08 -0400)
- 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

index 34d90bee7e8fcd3e9cfe1da96cd90da7ed2ee3c7..02b57f39865cda9e87e2d21d1c32987d4b08fb50 100644 (file)
@@ -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,
 };