Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

efi_loader: simplify efi_open_protocol

Browse source 
Use function efi_search_protocol.

Reviewed-by: Simon Glass <sjg@chromium.org>
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-11-26 14:05:15 +01:00 committed by Alexander Graf
parent 9449358a71
commit 80286e8f81
1 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/efi_loader/efi_boottime.c
View file

@ -2051,8 +2051,7 @@ static efi_status_t EFIAPI efi_open_protocol(
void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes)
{
struct list_head *lhandle;
int i;
struct efi_handler *handler;
efi_status_t r = EFI_INVALID_PARAMETER;
EFI_ENTRY("%p, %pUl, %p, %p, %p, 0x%x", handle, protocol,
@ -2065,8 +2064,6 @@ static efi_status_t EFIAPI efi_open_protocol(
goto out;
}
EFI_PRINT_GUID("protocol", protocol);
switch (attributes) {
case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL:
case EFI_OPEN_PROTOCOL_GET_PROTOCOL:
@ -2087,33 +2084,12 @@ static efi_status_t EFIAPI efi_open_protocol(
goto out;
}
list_for_each(lhandle, &efi_obj_list) {
struct efi_object *efiobj;
efiobj = list_entry(lhandle, struct efi_object, link);
r = efi_search_protocol(handle, protocol, &handler);
if (r != EFI_SUCCESS)
goto out;
if (efiobj->handle != handle)
continue;
for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) {
struct efi_handler *handler = &efiobj->protocols[i];
const efi_guid_t *hprotocol = handler->guid;
if (!hprotocol)
continue;
if (!guidcmp(hprotocol, protocol)) {
if (attributes !=
EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {
*protocol_interface =
handler->protocol_interface;
}
r = EFI_SUCCESS;
goto out;
}
}
goto unsupported;
}
unsupported:
r = EFI_UNSUPPORTED;
if (attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL)
*protocol_interface = handler->protocol_interface;
out:
return EFI_EXIT(r);
}