efi_loader: factor out efi_check_register_notify_event()

The code to check if a registration key is a valid key returned by
RegisterProtocolNotify() can be reused. So let us factor it out into a new
function efi_check_register_notify_event().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 1ccf54c3860c133396f9203db18c4b137b87009d..dd5f706af76170520a96068b0aebdafdc2dfa959 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1388,6 +1388,27 @@ static int efi_search(enum efi_locate_search_type search_type,
        }
 }
 
+/**
+ * efi_check_register_notify_event() - check if registration key is valid
+ *
+ * Check that a pointer is a valid registration key as returned by
+ * RegisterProtocolNotify().
+ *
+ * @key:       registration key
+ * Return:     valid registration key or NULL
+ */
+static struct efi_register_notify_event *efi_check_register_notify_event
+                                                               (void *key)
+{
+       struct efi_register_notify_event *event;
+
+       list_for_each_entry(event, &efi_register_notify_events, link) {
+               if (event == (struct efi_register_notify_event *)key)
+                       return event;
+       }
+       return NULL;
+}
+
 /**
  * efi_locate_handle() - locate handles implementing a protocol
  *
@@ -1409,7 +1430,7 @@ static efi_status_t efi_locate_handle(
 {
        struct efi_object *efiobj;
        efi_uintn_t size = 0;
-       struct efi_register_notify_event *item, *event = NULL;
+       struct efi_register_notify_event *event;
        struct efi_protocol_notification *handle = NULL;
 
        /* Check parameters */
@@ -1420,13 +1441,7 @@ static efi_status_t efi_locate_handle(
                if (!search_key)
                        return EFI_INVALID_PARAMETER;
                /* Check that the registration key is valid */
-               list_for_each_entry(item, &efi_register_notify_events, link) {
-                       if (item ==
-                           (struct efi_register_notify_event *)search_key) {
-                               event = item;
-                               break;
-                       }
-               }
+               event = efi_check_register_notify_event(search_key);
                if (!event)
                        return EFI_INVALID_PARAMETER;
                break;