From 4e4d4dffd9719f832f8787df393b95dfad8f4cc5 Mon Sep 17 00:00:00 2001 From: stefanct Date: Sat, 14 Sep 2013 09:02:27 +0000 Subject: Remove exit call and mayfail parameter from physmap_common(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only call path where exit was reached was from physmap functions. Callers of physmap() et al. which were not prepared to handle ERROR_PTR return values have been adjusted. physmap_try_ro() has been renamed to physmap_ro() and physmap_common() slightly refactored due to the now removed *FAIL parameters. Signed-off-by: Niklas Söderlund Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1745 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- dmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dmi.c') diff --git a/dmi.c b/dmi.c index d6acb4b..14f3871 100644 --- a/dmi.c +++ b/dmi.c @@ -250,8 +250,8 @@ int dmi_fill(void) * - EFI's configuration table contains a pointer to the SMBIOS table. On linux it can be obtained from * sysfs. EFI's SMBIOS GUID is: {0xeb9d2d31,0x2d88,0x11d3,0x9a,0x16,0x0,0x90,0x27,0x3f,0xc1,0x4d} * - Scanning physical memory address range 0x000F0000h to 0x000FFFFF for the anchor-string(s). */ - dmi_mem = physmap_try_ro("DMI", 0xF0000, 0x10000); - if (dmi_mem == NULL) + dmi_mem = physmap_ro("DMI", 0xF0000, 0x10000); + if (dmi_mem == ERROR_PTR) return ret; for (fp = 0; fp <= 0xFFF0; fp += 16) { -- cgit v1.2.1