bface6d
From 65c9d42b682211e20ae4090d8e18bd63e40709c5 Mon Sep 17 00:00:00 2001
bface6d
From: Matt Fleming <matt.fleming@intel.com>
bface6d
Date: Mon, 15 Sep 2014 16:20:54 +0100
bface6d
Subject: [PATCH] x86/efi: Delete misleading efi_printk() error message
bface6d
MIME-Version: 1.0
bface6d
Content-Type: text/plain; charset=UTF-8
bface6d
Content-Transfer-Encoding: 8bit
bface6d
bface6d
A number of people are reporting seeing the "setup_efi_pci() failed!"
bface6d
error message in what used to be a quiet boot,
bface6d
bface6d
  https://bugzilla.kernel.org/show_bug.cgi?id=81891
bface6d
bface6d
The message isn't all that helpful because setup_efi_pci() can return a
bface6d
non-success error code for a variety of reasons, not all of them fatal.
bface6d
bface6d
Drop the efi_printk() now that we have more fine-grained, and more
bface6d
specific, error messages throughout the *setup_efi_pci*() code paths.
bface6d
bface6d
Upstream-status: 3.18
bface6d
bface6d
Reported-by: Darren Hart <dvhart@linux.intel.com>
bface6d
Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
bface6d
Cc: Ulf Winkelvos <ulf@winkelvos.de>
bface6d
Cc: Andre Müller <andre.muller@web.de>
bface6d
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
bface6d
---
bface6d
 arch/x86/boot/compressed/eboot.c | 5 +----
bface6d
 1 file changed, 1 insertion(+), 4 deletions(-)
bface6d
bface6d
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
bface6d
index 3b18ef2b534c..700a7564a3d0 100644
bface6d
--- a/arch/x86/boot/compressed/eboot.c
bface6d
+++ b/arch/x86/boot/compressed/eboot.c
bface6d
@@ -1430,10 +1430,7 @@ struct boot_params *efi_main(struct efi_config *c,
bface6d
 
bface6d
 	setup_graphics(boot_params);
bface6d
 
bface6d
-	status = setup_efi_pci(boot_params);
bface6d
-	if (status != EFI_SUCCESS) {
bface6d
-		efi_printk(sys_table, "setup_efi_pci() failed!\n");
bface6d
-	}
bface6d
+	setup_efi_pci(boot_params);
bface6d
 
bface6d
 	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
bface6d
 				sizeof(*gdt), (void **)&gdt;;
bface6d
-- 
bface6d
1.9.3
bface6d