From 5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= 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. Corresponding to flashrom svn r1745. Signed-off-by: Niklas Söderlund Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- sb600spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sb600spi.c') diff --git a/sb600spi.c b/sb600spi.c index febeabb..8f93d65 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -353,7 +353,7 @@ int sb600_probe_spi(struct pci_dev *dev) /* Physical memory has to be mapped at page (4k) boundaries. */ sb600_spibar = rphysmap("SB600 SPI registers", tmp & 0xfffff000, 0x1000); if (sb600_spibar == ERROR_PTR) - return 1; + return ERROR_FATAL; /* The low bits of the SPI base address are used as offset into * the mapped page. -- cgit v1.1