dm: pci: change bus number register setting compliant with Linux

[oweals/u-boot.git] / lib / efi_selftest / efi_selftest.c

diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index efec832e987340c5e1a7fbc5e5c0740a0d6d099d..45d8d3d384c1814ea7e5fdff88c8994b51e3f9e7 100644 (file)
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -35,8 +35,8 @@ void efi_st_exit_boot_services(void)
        ret = boottime->get_memory_map(&map_size, NULL, &map_key, &desc_size,
                                       &desc_version);
        if (ret != EFI_BUFFER_TOO_SMALL) {
-               efi_st_printf("ERROR: GetMemoryMap did not return "
-                             "EFI_BUFFER_TOO_SMALL\n");
+               efi_st_error(
+                       "GetMemoryMap did not return EFI_BUFFER_TOO_SMALL\n");
                return;
        }
        /* Allocate extra space for newly allocated memory */
@@ -44,21 +44,18 @@ void efi_st_exit_boot_services(void)
        ret = boottime->allocate_pool(EFI_BOOT_SERVICES_DATA, map_size,
                                      (void **)&memory_map);
        if (ret != EFI_SUCCESS) {
-               efi_st_printf("ERROR: AllocatePool did not return "
-                             "EFI_SUCCESS\n");
+               efi_st_error("AllocatePool did not return EFI_SUCCESS\n");
                return;
        }
        ret = boottime->get_memory_map(&map_size, memory_map, &map_key,
                                       &desc_size, &desc_version);
        if (ret != EFI_SUCCESS) {
-               efi_st_printf("ERROR: GetMemoryMap did not return "
-                             "EFI_SUCCESS\n");
+               efi_st_error("GetMemoryMap did not return EFI_SUCCESS\n");
                return;
        }
        ret = boottime->exit_boot_services(handle, map_key);
        if (ret != EFI_SUCCESS) {
-               efi_st_printf("ERROR: ExitBootServices did not return "
-                             "EFI_SUCCESS\n");
+               efi_st_error("ExitBootServices did not return EFI_SUCCESS\n");
                return;
        }
        efi_st_printf("\nBoot services terminated\n");
@@ -69,17 +66,18 @@ void efi_st_exit_boot_services(void)
  *
  * @test       the test to be executed
  * @failures   counter that will be incremented if a failure occurs
+ * @return     EFI_ST_SUCCESS for success
  */
 static int setup(struct efi_unit_test *test, unsigned int *failures)
 {
        int ret;
 
        if (!test->setup)
-               return 0;
+               return EFI_ST_SUCCESS;
        efi_st_printf("\nSetting up '%s'\n", test->name);
        ret = test->setup(handle, systable);
-       if (ret) {
-               efi_st_printf("ERROR: Setting up '%s' failed\n", test->name);
+       if (ret != EFI_ST_SUCCESS) {
+               efi_st_error("Setting up '%s' failed\n", test->name);
                ++*failures;
        } else {
                efi_st_printf("Setting up '%s' succeeded\n", test->name);
@@ -92,17 +90,18 @@ static int setup(struct efi_unit_test *test, unsigned int *failures)
  *
  * @test       the test to be executed
  * @failures   counter that will be incremented if a failure occurs
+ * @return     EFI_ST_SUCCESS for success
  */
 static int execute(struct efi_unit_test *test, unsigned int *failures)
 {
        int ret;
 
        if (!test->execute)
-               return 0;
+               return EFI_ST_SUCCESS;
        efi_st_printf("\nExecuting '%s'\n", test->name);
        ret = test->execute();
-       if (ret) {
-               efi_st_printf("ERROR: Executing '%s' failed\n", test->name);
+       if (ret != EFI_ST_SUCCESS) {
+               efi_st_error("Executing '%s' failed\n", test->name);
                ++*failures;
        } else {
                efi_st_printf("Executing '%s' succeeded\n", test->name);
@@ -115,17 +114,18 @@ static int execute(struct efi_unit_test *test, unsigned int *failures)
  *
  * @test       the test to be torn down
  * @failures   counter that will be incremented if a failure occurs
+ * @return     EFI_ST_SUCCESS for success
  */
 static int teardown(struct efi_unit_test *test, unsigned int *failures)
 {
        int ret;
 
        if (!test->teardown)
-               return 0;
+               return EFI_ST_SUCCESS;
        efi_st_printf("\nTearing down '%s'\n", test->name);
        ret = test->teardown();
-       if (ret) {
-               efi_st_printf("ERROR: Tearing down '%s' failed\n", test->name);
+       if (ret != EFI_ST_SUCCESS) {
+               efi_st_error("Tearing down '%s' failed\n", test->name);
                ++*failures;
        } else {
                efi_st_printf("Tearing down '%s' succeeded\n", test->name);
@@ -213,7 +213,8 @@ efi_status_t EFIAPI efi_selftest(efi_handle_t image_handle,
        efi_st_get_key();
        runtime->reset_system(EFI_RESET_WARM, EFI_NOT_READY,
                              sizeof(reset_message), reset_message);
-       efi_st_printf("\nERROR: reset failed.\n");
+       efi_st_printf("\n");
+       efi_st_error("Reset failed.\n");
 
        return EFI_UNSUPPORTED;
 }