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>

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 0ad7ade79c67754ec5ba5b3a0d2d1d4168f79eab..0914b7199783562450b74b67b37ee04a099fb9f7 100644 (file)
--- 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,