brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 15:10:26 +09:00
Code Issues Projects Releases Wiki Activity

efi_loader: simplify efi_uninstall_protocol_interface

Browse Source 
Use function efi_search_obj, efi_search_protocol and
efi_remove_protocol to simplify the coding.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2017-10-26 19:25:56 +02:00 committed by Alexander Graf
parent 42cf12420b
commit 5810511dac
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/efi_loader/efi_boottime.c
View File

@ -906,9 +906,8 @@ static efi_status_t EFIAPI efi_uninstall_protocol_interface(
void *handle, const efi_guid_t *protocol, void *handle, const efi_guid_t *protocol,
void *protocol_interface) void *protocol_interface)
{ {
struct list_head *lhandle; struct efi_handler *handler;
int i; efi_status_t r;
efi_status_t r = EFI_NOT_FOUND;
EFI_ENTRY("%p, %pUl, %p", handle, protocol, protocol_interface); EFI_ENTRY("%p, %pUl, %p", handle, protocol, protocol_interface);
@ -917,31 +916,16 @@ static efi_status_t EFIAPI efi_uninstall_protocol_interface(
goto out; goto out;
} }
list_for_each(lhandle, &efi_obj_list) { /* Find the protocol on the handle */
struct efi_object *efiobj; r = efi_search_protocol(handle, protocol, &handler);
efiobj = list_entry(lhandle, struct efi_object, link); if (r != EFI_SUCCESS)
goto out;
if (efiobj->handle != handle) if (handler->protocol_interface) {
continue; /* TODO disconnect controllers */
r = EFI_ACCESS_DENIED;
for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) { } else {
struct efi_handler *handler = &efiobj->protocols[i]; r = efi_remove_protocol(handle, protocol, protocol_interface);
const efi_guid_t *hprotocol = handler->guid;
if (!hprotocol)
continue;
if (!guidcmp(hprotocol, protocol)) {
if (handler->protocol_interface) {
r = EFI_ACCESS_DENIED;
} else {
handler->guid = 0;
r = EFI_SUCCESS;
}
goto out;
}
}
} }
out: out:
return EFI_EXIT(r); return EFI_EXIT(r);
} }