Skip to contentSkip to conversation

efi_loader: remove double EFI_EXIT() with efi_unsupported

PATCH Applied Rob Clark 2 participants 2 messages Jul 26, 2017 – Jul 28, 2017

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 efi_loader: remove double EFI_EXIT() with efi_unsupported

Probably this went unnoticed before, but it causes problems with addition of 804b1d73 ("efi_loader: log EFI return values too")

Signed-off-by Rob Clark <[email protected]>
---
 lib/efi_loader/efi_boottime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/efi_loader/efi_boottime.c +2 -2
index 96d32a9902..9aeb412f50 100644
@@ -146,7 +146,7 @@ static unsigned long EFIAPI efi_raise_tpl(UINTN new_tpl)
 static void EFIAPI efi_restore_tpl(UINTN old_tpl)
 {
 	EFI_ENTRY("0x%zx", old_tpl);
-	EFI_EXIT(efi_unsupported(__func__));
+	efi_unsupported(__func__);
 }
 
 static efi_status_t EFIAPI efi_allocate_pages_ext(int type, int memory_type,

@@ -880,7 +880,7 @@ static efi_status_t EFIAPI efi_set_watchdog_timer(unsigned long timeout,
 {
 	EFI_ENTRY("%ld, 0x%"PRIx64", %ld, %p", timeout, watchdog_code,
 		  data_size, watchdog_data);
-	return EFI_EXIT(efi_unsupported(__func__));
+	return efi_unsupported(__func__);
 }
 
 static efi_status_t EFIAPI efi_connect_controller(
Signature · 1 line
2.13.0
Applied
#1 lore raw
Quoted 4 lines

Probably this went unnoticed before, but it causes problems with addition of 804b1d73 ("efi_loader: log EFI return values too")

Signed-off-by Rob Clark <[email protected]>

Thanks, applied to efi-next

Alex