efi_loader: wrong type in wait_for_event

The UEFI spec defines parameter index of WaitForEvent as UINTN*.
So we should use size_t here.

I deliberately do not use UINTN because I hold a following patch
that will eliminate UINTN because uppercase types to not match
the U-Boot coding style.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/efi_api.h b/include/efi_api.h
index aa4306aac94a135f6d90fe05d723ebbe359e0df8..c44dc9d0cbde7d513884255ef8fd76bba72c4c2e 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -71,7 +71,7 @@ struct efi_boot_services {
                                         enum efi_timer_delay type,
                                         uint64_t trigger_time);
        efi_status_t (EFIAPI *wait_for_event)(unsigned long number_of_events,
-                       struct efi_event **event, unsigned long *index);
+                       struct efi_event **event, size_t *index);
        efi_status_t (EFIAPI *signal_event)(struct efi_event *event);
        efi_status_t (EFIAPI *close_event)(struct efi_event *event);
        efi_status_t (EFIAPI *check_event)(struct efi_event *event);

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index e5adc17faba94d9a09721d0b6d625d5d7f839592..976d5822f7d578aa764a2b1e5a6c69e00cd90b44 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -553,7 +553,7 @@ static efi_status_t EFIAPI efi_set_timer_ext(struct efi_event *event,
  */
 static efi_status_t EFIAPI efi_wait_for_event(unsigned long num_events,
                                              struct efi_event **event,
-                                             unsigned long *index)
+                                             size_t *index)
 {
        int i, j;
 

diff --git a/lib/efi_selftest/efi_selftest_events.c b/lib/efi_selftest/efi_selftest_events.c
index 532f165d437bea27b94bd95871f4f1e5ca691ccc..b2cdc150da256e84d85920f31149c3de08e1701e 100644 (file)
--- a/lib/efi_selftest/efi_selftest_events.c
+++ b/lib/efi_selftest/efi_selftest_events.c
@@ -108,7 +108,7 @@ static int teardown(void)
  */
 static int execute(void)
 {
-       unsigned long index;
+       size_t index;
        efi_status_t ret;
 
        /* Set 10 ms timer */

diff --git a/lib/efi_selftest/efi_selftest_tpl.c b/lib/efi_selftest/efi_selftest_tpl.c
index 5d13f3b52da90b3c2ad3b7aa04b09dabb466f0bd..0b78ee759568b7e90b5a32ce449dc412d88b76eb 100644 (file)
--- a/lib/efi_selftest/efi_selftest_tpl.c
+++ b/lib/efi_selftest/efi_selftest_tpl.c
@@ -110,7 +110,7 @@ static int teardown(void)
  */
 static int execute(void)
 {
-       unsigned long index;
+       size_t index;
        efi_status_t ret;
        UINTN old_tpl;