efi_loader: make efi_remove_protocol() static

A previous patch is removing the last consumer of efi_remove_protocol().
Switch that to static and treat it as an internal API in order to force
users install and remove protocols with the appropriate EFI functions.

It's worth noting that we still have files using efi_add_protocol().  We
should convert all these to efi_install_multiple_protocol_interfaces()
and treat efi_add_protocol() in a similar manner

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 604fd765f75001390246e0d2001d3be329563fc6..b5fa0fe01dedfdcdcd9ff7c947ead83c552ad4d6 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -662,10 +662,6 @@ efi_status_t efi_protocol_open(struct efi_handler *handler,
                               void **protocol_interface, void *agent_handle,
                               void *controller_handle, uint32_t attributes);
 
-/* Delete protocol from a handle */
-efi_status_t efi_remove_protocol(const efi_handle_t handle,
-                                const efi_guid_t *protocol,
-                                void *protocol_interface);
 /* Install multiple protocol interfaces */
 efi_status_t EFIAPI
 efi_install_multiple_protocol_interfaces(efi_handle_t *handle, ...);

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 69f2daa8acc3bc41bc5e934d415194bf19a6edcd..052fe481e473a5067bb3c40b22e6592b096c4d5b 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -575,9 +575,9 @@ efi_status_t efi_search_protocol(const efi_handle_t handle,
  *
  * Return: status code
  */
-efi_status_t efi_remove_protocol(const efi_handle_t handle,
-                                const efi_guid_t *protocol,
-                                void *protocol_interface)
+static efi_status_t efi_remove_protocol(const efi_handle_t handle,
+                                       const efi_guid_t *protocol,
+                                       void *protocol_interface)
 {
        struct efi_handler *handler;
        efi_status_t ret;