efi_selftest: simplify efi_selftest_reset

Use global st_runtime.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/lib/efi_selftest/efi_selftest_reset.c b/lib/efi_selftest/efi_selftest_reset.c
index 5dfe517de4f574363b9dccb688e9050648d60a0e..8125f51815ec240971a9145799b8e9eaf7cdcf30 100644 (file)
--- a/lib/efi_selftest/efi_selftest_reset.c
+++ b/lib/efi_selftest/efi_selftest_reset.c
@@ -10,22 +10,6 @@
 
 #include <efi_selftest.h>
 
-static struct efi_runtime_services *runtime;
-
-/*
- * Setup unit test.
- *
- * @handle:    handle of the loaded image
- * @systable:  system table
- * Return:     EFI_ST_SUCCESS for success
- */
-static int setup(const efi_handle_t handle,
-                const struct efi_system_table *systable)
-{
-       runtime = systable->runtime;
-       return EFI_ST_SUCCESS;
-}
-
 /*
  * Execute unit test.
  *
@@ -35,7 +19,7 @@ static int execute(void)
 {
        u16 reset_data[] = u"Reset by selftest";
 
-       runtime->reset_system(EFI_RESET_COLD, EFI_SUCCESS,
+       st_runtime->reset_system(EFI_RESET_COLD, EFI_SUCCESS,
                              sizeof(reset_data), reset_data);
        efi_st_error("Reset failed.\n");
        return EFI_ST_FAILURE;
@@ -44,7 +28,6 @@ static int execute(void)
 EFI_UNIT_TEST(reset) = {
        .name = "reset system",
        .phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT,
-       .setup = setup,
        .execute = execute,
        .on_request = true,
 };
@@ -52,7 +35,6 @@ EFI_UNIT_TEST(reset) = {
 EFI_UNIT_TEST(resetrt) = {
        .name = "reset system runtime",
        .phase = EFI_SETUP_BEFORE_BOOTTIME_EXIT,
-       .setup = setup,
        .execute = execute,
        .on_request = true,
 };