summaryrefslogtreecommitdiffstats
path: root/programmer.h
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 /programmer.h
parent2d8b7ef4a84e4946619fa8e4d1b9fcaa15208440 (diff)
downloadflashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.gz
flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.tar.bz2
flashrom-5d3072030ac6ad017a25ff0fa4bc451fa8b65ed8.zip
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 'programmer.h')
-rw-r--r--programmer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/programmer.h b/programmer.h
index ac757b965..aca357c2a 100644
--- a/programmer.h
+++ b/programmer.h
@@ -278,7 +278,7 @@ int processor_flash_enable(void);
void *physmap(const char *descr, uintptr_t phys_addr, size_t len);
void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len);
void *physmap_round(const char *descr, uintptr_t phys_addr, size_t len);
-void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len);
+void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len);
void physunmap(void *virt_addr, size_t len);
#if CONFIG_INTERNAL == 1
int setup_cpu_msr(int cpu);