[S] Change in flashrom[master]: flashrom.c: Remove custom mappers from opaque_master

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68092 )

Change subject: flashrom.c: Remove custom mappers from opaque_master
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68092
Reviewed-by: Edward O'Callaghan 
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M flashrom.c
M include/programmer.h
2 files changed, 21 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, approved

diff --git a/flashrom.c b/flashrom.c
index 90899f0..c5f712a 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 @@
 static bool master_uses_physmap(const struct registered_master *mst)
 {
 #if CONFIG_INTERNAL == 1
-	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 */