GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: refactor efi_uninstall_protocol_interface

Browse source 
For the implementation of UninstallMultipleProtocolInterfaces we
need to call efi_uninstall_protocol_interface. In internal calls
we should not pass through EFI_EXIT.

The patch introduces a wrapper function
efi_uninstall_protocol_interface_ext.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
xypron.glpk@gmx.de 2017-07-11 22:06:19 +02:00 • committed by Alexander Graf
parent 8bee5a3c13
commit 3d8e145608
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/efi_loader/efi_boottime.c
View file

@ -384,8 +384,6 @@ static efi_status_t EFIAPI efi_uninstall_protocol_interface(void *handle,
int i; int i;
efi_status_t r = EFI_NOT_FOUND; efi_status_t r = EFI_NOT_FOUND;
EFI_ENTRY("%p, %p, %p", handle, protocol, protocol_interface);
if (!handle || !protocol) { if (!handle || !protocol) {
r = EFI_INVALID_PARAMETER; r = EFI_INVALID_PARAMETER;
goto out; goto out;
@ -417,7 +415,16 @@ static efi_status_t EFIAPI efi_uninstall_protocol_interface(void *handle,
} }
out: out:
return EFI_EXIT(r); return r;
}
static efi_status_t EFIAPI efi_uninstall_protocol_interface_ext(void *handle,
efi_guid_t *protocol, void *protocol_interface)
{
EFI_ENTRY("%p, %p, %p", handle, protocol, protocol_interface);
return EFI_EXIT(efi_uninstall_protocol_interface(handle, protocol,
protocol_interface));
} }
static efi_status_t EFIAPI efi_register_protocol_notify(efi_guid_t *protocol, static efi_status_t EFIAPI efi_register_protocol_notify(efi_guid_t *protocol,
@ -905,7 +912,7 @@ static const struct efi_boot_services efi_boot_services = {
.check_event = efi_check_event, .check_event = efi_check_event,
.install_protocol_interface = efi_install_protocol_interface_ext, .install_protocol_interface = efi_install_protocol_interface_ext,
.reinstall_protocol_interface = efi_reinstall_protocol_interface, .reinstall_protocol_interface = efi_reinstall_protocol_interface,
.uninstall_protocol_interface = efi_uninstall_protocol_interface, .uninstall_protocol_interface = efi_uninstall_protocol_interface_ext,
.handle_protocol = efi_handle_protocol, .handle_protocol = efi_handle_protocol,
.reserved = NULL, .reserved = NULL,
.register_protocol_notify = efi_register_protocol_notify, .register_protocol_notify = efi_register_protocol_notify,