[PATCH 1/1] efi_loader: simplify efi_set_load_options()

[PATCH 1/1] efi_loader: simplify efi_set_load_options()

[Heinrich Schuchardt]

* Replace the OpenProtocol() call by efi_search_protocol().
* Remove the CloseProtocol() call.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 lib/efi_loader/efi_load_options.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/efi_loader/efi_load_options.c b/lib/efi_loader/efi_load_options.c
index 71454f0fc6..3cfddee014 100644
--- a/lib/efi_loader/efi_load_options.c
+++ b/lib/efi_loader/efi_load_options.c
@@ -27,23 +27,18 @@ efi_status_t efi_set_load_options(efi_handle_t handle,
 				  void *load_options)
 {
 	struct efi_loaded_image *loaded_image_info;
+	struct efi_handler *handler;
 	efi_status_t ret;
 
-	ret = EFI_CALL(systab.boottime->open_protocol(
-					handle,
-					&efi_guid_loaded_image,
-					(void **)&loaded_image_info,
-					efi_root, NULL,
-					EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL));
+	ret = efi_search_protocol(handle, &efi_guid_loaded_image, &handler);
+	loaded_image_info = handler->protocol_interface;
 	if (ret != EFI_SUCCESS)
 		return EFI_INVALID_PARAMETER;
 
 	loaded_image_info->load_options = load_options;
 	loaded_image_info->load_options_size = load_options_size;
 
-	return EFI_CALL(systab.boottime->close_protocol(handle,
-							&efi_guid_loaded_image,
-							efi_root, NULL));
+	return EFI_SUCCESS;
 }
 
 /**
-- 
2.37.2

Re: [PATCH 1/1] efi_loader: simplify efi_set_load_options()

[Ilias Apalodimas]

On Sat, Oct 08, 2022 at 09:13:00AM +0200, Heinrich Schuchardt wrote:
> * Replace the OpenProtocol() call by efi_search_protocol().
> * Remove the CloseProtocol() call.
> 
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
>  lib/efi_loader/efi_load_options.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/efi_loader/efi_load_options.c b/lib/efi_loader/efi_load_options.c
> index 71454f0fc6..3cfddee014 100644
> --- a/lib/efi_loader/efi_load_options.c
> +++ b/lib/efi_loader/efi_load_options.c
> @@ -27,23 +27,18 @@ efi_status_t efi_set_load_options(efi_handle_t handle,
>  				  void *load_options)
>  {
>  	struct efi_loaded_image *loaded_image_info;
> +	struct efi_handler *handler;
>  	efi_status_t ret;
>  
> -	ret = EFI_CALL(systab.boottime->open_protocol(
> -					handle,
> -					&efi_guid_loaded_image,
> -					(void **)&loaded_image_info,
> -					efi_root, NULL,
> -					EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL));
> +	ret = efi_search_protocol(handle, &efi_guid_loaded_image, &handler);
> +	loaded_image_info = handler->protocol_interface;
>  	if (ret != EFI_SUCCESS)
>  		return EFI_INVALID_PARAMETER;
>  
>  	loaded_image_info->load_options = load_options;
>  	loaded_image_info->load_options_size = load_options_size;
>  
> -	return EFI_CALL(systab.boottime->close_protocol(handle,
> -							&efi_guid_loaded_image,
> -							efi_root, NULL));
> +	return EFI_SUCCESS;
>  }
>  
>  /**
> -- 
> 2.37.2
> 
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>