arm_dpm: -Wshadow warning fix

[openocd] / src / target / xscale.c

diff --git a/src/target/xscale.c b/src/target/xscale.c
index ed0eef35237ec62de9bc7c5c20eb494ffdf57998..d5c212999b8a6bf239d7038b8747d2e4d5b91ef8 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3216,21 +3216,18 @@ static int xscale_virt2phys(struct target *target,
                uint32_t virtual, uint32_t *physical)
 {
        struct xscale_common *xscale = target_to_xscale(target);
-       int type;
        uint32_t cb;
-       int domain;
-       uint32_t ap;
 
        if (xscale->common_magic != XSCALE_COMMON_MAGIC) {
                LOG_ERROR(xscale_not);
                return ERROR_TARGET_INVALID;
        }
 
-       uint32_t ret = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap);
-       if (type == -1)
-       {
-               return ret;
-       }
+       uint32_t ret;
+       int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu,
+                       virtual, &cb, &ret);
+       if (retval != ERROR_OK)
+               return retval;
        *physical = ret;
        return ERROR_OK;
 }