openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-11-17 21:20:40 +01:00
Code Issues Releases Wiki Activity

programmer: Drop dead fallback_map() boilerplate

Browse Source 
The fallback_{un}map() boilerplate code doesn't do anything,
merely distracts away from otherwise linear control flow. Just
drop it as anything in the future that could need such a thing
is free to implement it when required.

Change-Id: Ibb7760f807fae040416cef2797a7dbf6572f7df9
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68963
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Edward O'Callaghan
2022-10-30 15:53:18 +11:00
committed by Felix Singer
parent 801e7c1674
commit c0813e7edd
4 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flashrom.c
View File

@@ -215,11 +215,15 @@ void *master_map_flash_region(const struct registered_master *mst,
else if (mst->buses_supported & BUS_NONSPI)
map_flash_region = mst->par.map_flash_region;
void *ret;
/* A result of NULL causes mapped addresses to be chip physical
* addresses, assuming only a single region is mapped (the entire flash
* space). Chips with a second region (like a register map) require a
* real memory mapping to distinguish the different ranges. Those chips
* are FWH/LPC, so the bus master provides a real mapping.
*/
void *ret = NULL;
if (map_flash_region)
ret = map_flash_region(descr, phys_addr, len);
else
ret = fallback_map(descr, phys_addr, len);
msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n",
__func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret);
return ret;
@@ -236,8 +240,6 @@ void master_unmap_flash_region(const struct registered_master *mst,
if (unmap_flash_region)
unmap_flash_region(virt_addr, len);
else
fallback_unmap(virt_addr, len);
msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr);
}