summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorxypron.glpk@gmx.de <xypron.glpk@gmx.de>2017-07-11 20:06:18 (GMT)
committerAlexander Graf <agraf@suse.de>2017-07-19 12:14:38 (GMT)
commit8bee5a3c1365098f293305bf6744482cfe85e51d (patch)
tree6c3898f05853ab454b2452fedcbae51cf1c22025 /lib
parent4b6ed0d7a1d915524dd1ecccf023d519d7022a49 (diff)
downloadu-boot-fsl-qoriq-8bee5a3c1365098f293305bf6744482cfe85e51d.tar.xz
efi_loader: refactor efi_install_protocol_interface
For the implementation of InstallMultipleProtocolInterfaces we need to call efi_install_protocol_interface. In internal calls we should not pass through EFI_EXIT. The patch introduces a wrapper function efi_install_protocol_interface_ext. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/efi_loader/efi_boottime.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 0ad7ade..0914b71 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -307,9 +307,6 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle,
int i;
efi_status_t r;
- EFI_ENTRY("%p, %p, %d, %p", handle, protocol, protocol_interface_type,
- protocol_interface);
-
if (!handle || !protocol ||
protocol_interface_type != EFI_NATIVE_INTERFACE) {
r = EFI_INVALID_PARAMETER;
@@ -356,7 +353,19 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle,
}
r = EFI_INVALID_PARAMETER;
out:
- return EFI_EXIT(r);
+ return r;
+}
+
+static efi_status_t EFIAPI efi_install_protocol_interface_ext(void **handle,
+ efi_guid_t *protocol, int protocol_interface_type,
+ void *protocol_interface)
+{
+ EFI_ENTRY("%p, %p, %d, %p", handle, protocol, protocol_interface_type,
+ protocol_interface);
+
+ return EFI_EXIT(efi_install_protocol_interface(handle, protocol,
+ protocol_interface_type,
+ protocol_interface));
}
static efi_status_t EFIAPI efi_reinstall_protocol_interface(void *handle,
@@ -894,7 +903,7 @@ static const struct efi_boot_services efi_boot_services = {
.signal_event = efi_signal_event,
.close_event = efi_close_event,
.check_event = efi_check_event,
- .install_protocol_interface = efi_install_protocol_interface,
+ .install_protocol_interface = efi_install_protocol_interface_ext,
.reinstall_protocol_interface = efi_reinstall_protocol_interface,
.uninstall_protocol_interface = efi_uninstall_protocol_interface,
.handle_protocol = efi_handle_protocol,