aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2018-01-11 08:16:03 +0100
committerAlexander Graf <agraf@suse.de>2018-01-22 23:09:13 +0100
commit3ebcd0071f2af8b05bc04c0fea7cd33a29aefb9e (patch)
tree43149cb1b50aef3db78953a96dddadc8406c1b28
parentf0959dbee2b043c4b1bf16a570be9242cf603819 (diff)
downloadu-boot-3ebcd0071f2af8b05bc04c0fea7cd33a29aefb9e.zip
u-boot-3ebcd0071f2af8b05bc04c0fea7cd33a29aefb9e.tar.gz
u-boot-3ebcd0071f2af8b05bc04c0fea7cd33a29aefb9e.tar.bz2
efi_loader: fix signature of efi_disconnect_controller
Handles should be passed as efi_handle_t and not as void *. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--include/efi_api.h6
-rw-r--r--lib/efi_loader/efi_boottime.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/include/efi_api.h b/include/efi_api.h
index 81e580d..7164492 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -125,8 +125,10 @@ struct efi_boot_services {
efi_handle_t *driver_image_handle,
struct efi_device_path *remaining_device_path,
bool recursive);
- efi_status_t (EFIAPI *disconnect_controller)(void *controller_handle,
- void *driver_image_handle, void *child_handle);
+ efi_status_t (EFIAPI *disconnect_controller)(
+ efi_handle_t controller_handle,
+ efi_handle_t driver_image_handle,
+ efi_handle_t child_handle);
#define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL 0x00000001
#define EFI_OPEN_PROTOCOL_GET_PROTOCOL 0x00000002
#define EFI_OPEN_PROTOCOL_TEST_PROTOCOL 0x00000004
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 09d5168..fa00902 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1649,9 +1649,10 @@ static efi_status_t EFIAPI efi_set_watchdog_timer(unsigned long timeout,
* @child_handle handle of the child to destroy
* @return status code
*/
-static efi_status_t EFIAPI efi_disconnect_controller(void *controller_handle,
- void *driver_image_handle,
- void *child_handle)
+static efi_status_t EFIAPI efi_disconnect_controller(
+ efi_handle_t controller_handle,
+ efi_handle_t driver_image_handle,
+ efi_handle_t child_handle)
{
EFI_ENTRY("%p, %p, %p", controller_handle, driver_image_handle,
child_handle);