summaryrefslogtreecommitdiffstats
path: root/cbtable.c
diff options
context:
space:
mode:
authorNiklas Söderlund <niso@kth.se>2013-09-14 09:02:27 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-09-14 09:02:27 +0000
commit5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8 (patch)
tree1d4a18ad60037ced5824c9f509dd77997f56054a /cbtable.c
parent2d8b7ef4a84e4946619fa8e4d1b9fcaa15208440 (diff)
downloadast2050-flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.zip
ast2050-flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.gz
Remove exit call and mayfail parameter from physmap_common()
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 <niso@kth.se> Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'cbtable.c')
-rw-r--r--cbtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cbtable.c b/cbtable.c
index e262a84..e5bcb45 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -261,7 +261,7 @@ int cb_parse_table(const char **vendor, const char **model)
#else
start = 0x0;
#endif
- table_area = physmap_try_ro("low megabyte", start, BYTES_TO_MAP - start);
+ table_area = physmap_ro("low megabyte", start, BYTES_TO_MAP - start);
if (ERROR_PTR == table_area) {
msg_perr("Failed getting access to coreboot low tables.\n");
return -1;
@@ -277,7 +277,7 @@ int cb_parse_table(const char **vendor, const char **model)
start = forward->forward;
start &= ~(getpagesize() - 1);
physunmap(table_area, BYTES_TO_MAP);
- table_area = physmap_try_ro("high tables", start, BYTES_TO_MAP);
+ table_area = physmap_ro("high tables", start, BYTES_TO_MAP);
if (ERROR_PTR == table_area) {
msg_perr("Failed getting access to coreboot high tables.\n");
return -1;
OpenPOWER on IntegriCloud