arm_dpm: -Wshadow warning fix

[openocd] / src / target / arm720t.c

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 009336082135dfdea6b72ea9e10e762ff654a9c9..8db0b5d578cc963a20b8376f1d4f85971350a0ad 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -254,17 +254,14 @@ static int arm720_mmu(struct target *target, int *enabled)
 static int arm720_virt2phys(struct target *target,
                uint32_t virtual, uint32_t *physical)
 {
-       int type;
        uint32_t cb;
-       int domain;
-       uint32_t ap;
        struct arm720t_common *arm720t = target_to_arm720(target);
 
-       uint32_t ret = armv4_5_mmu_translate_va(target, &arm720t->armv4_5_mmu, virtual, &type, &cb, &domain, &ap);
-       if (type == -1)
-       {
-               return ret;
-       }
+       uint32_t ret;
+       int retval = armv4_5_mmu_translate_va(target,
+                       &arm720t->armv4_5_mmu, virtual, &cb, &ret);
+       if (retval != ERROR_OK)
+               return retval;
        *physical = ret;
        return ERROR_OK;
 }