From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Sat, 3 Mar 2018 14:28:57 +0000 (+0100)
Subject: efi_loader: consistently return efi_status_t efi_watchdog_register
X-Git-Tag: v2018.05-rc2~45^2~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7b181d57d0c7080facce755c4b9ff7a22436a48;p=u-boot

efi_loader: consistently return efi_status_t efi_watchdog_register

efi_watchdog_register() should always return a status code and not
a boolean value.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/include/efi_loader.h b/include/efi_loader.h
index d2fadc5c73..48fbe7a214 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -187,7 +187,7 @@ efi_status_t efi_gop_register(void);
 /* Called by bootefi to make the network interface available */
 efi_status_t efi_net_register(void);
 /* Called by bootefi to make the watchdog available */
-int efi_watchdog_register(void);
+efi_status_t efi_watchdog_register(void);
 /* Called by bootefi to make SMBIOS tables available */
 efi_status_t efi_smbios_register(void);
 
diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c
index 35a45dedf8..b1c35a8e29 100644
--- a/lib/efi_loader/efi_watchdog.c
+++ b/lib/efi_loader/efi_watchdog.c
@@ -59,7 +59,7 @@ efi_status_t efi_set_watchdog(unsigned long timeout)
  *
  * This function is called by efi_init_obj_list()
  */
-int efi_watchdog_register(void)
+efi_status_t efi_watchdog_register(void)
 {
 	efi_status_t r;
 
@@ -85,5 +85,5 @@ int efi_watchdog_register(void)
 		printf("ERROR: Failed to set watchdog timer\n");
 		return r;
 	}
-	return 0;
+	return EFI_SUCCESS;
 }