Jonathon Hall has uploaded this change for review.

View Change

flashrom.c: Remove custom mappers from opaque_master

No opaque masters have a custom mapper.  The returned chipaddr is not
fed back into the read/write/erase functions, so this would only be
useful for side effects.

Change-Id: I36f05154edda371b51f8ff416f019837ff1c243d
Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
---
M flashrom.c
M include/programmer.h
2 files changed, 17 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/68092/1

diff --git a/flashrom.c b/flashrom.c
index 7f9fdea..0d114fc 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -211,9 +211,7 @@
 	 * fallback if it does not specialize it
 	 */
 	void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len) = NULL;
-	if (mst->buses_supported & BUS_PROG)
-		map_flash_region = mst->opaque.map_flash_region;
-	else if (mst->buses_supported & BUS_SPI)
+	if (mst->buses_supported & BUS_SPI)
 		map_flash_region = mst->spi.map_flash_region;
 	else if (mst->buses_supported & BUS_NONSPI)
 		map_flash_region = mst->par.map_flash_region;
@@ -232,9 +230,7 @@
 			       void *virt_addr, size_t len)
 {
 	void (*unmap_flash_region) (void *virt_addr, size_t len) = NULL;
-	if (mst->buses_supported & BUS_PROG)
-		unmap_flash_region = mst->opaque.unmap_flash_region;
-	else if (mst->buses_supported & BUS_SPI)
+	if (mst->buses_supported & BUS_SPI)
 		unmap_flash_region = mst->spi.unmap_flash_region;
 	else if (mst->buses_supported & BUS_NONSPI)
 		unmap_flash_region = mst->par.unmap_flash_region;
@@ -249,9 +245,7 @@
 #if CONFIG_INTERNAL == 1
 static bool master_uses_physmap(const struct registered_master *mst)
 {
-	if (mst->buses_supported & BUS_PROG)
-		return mst->opaque.map_flash_region == physmap;
-	else if (mst->buses_supported & BUS_SPI)
+	if (mst->buses_supported & BUS_SPI)
 		return mst->spi.map_flash_region == physmap;
 	else if (mst->buses_supported & BUS_NONSPI)
 		return mst->par.map_flash_region == physmap;
diff --git a/include/programmer.h b/include/programmer.h
index 4b5bf92..bfce5d6 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -398,8 +398,6 @@
 
 /* opaque.c */
 struct opaque_master {
-	void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len);
-	void (*unmap_flash_region) (void *virt_addr, size_t len);
 	int max_data_read;
 	int max_data_write;
 	/* Specific functions for this master */

To view, visit change 68092. To unsubscribe, or for help writing mail filters, visit settings.