target: arm: drop casts commented-out

The function dpm->finish() returns a value that is almost always
ignored.
Drop the commented-out cast
	/* (void) */

Change-Id: I7ff210a2693dd1877b7c7591705cdcd96a2c6125
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8498
Tested-by: jenkins
Reviewed-by: zapb <dev@zapb.de>

diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 318d5afec9ca6972389ca6c921cbcf13fc6d802b..0b2db77c5c44144fce7a94c30355bf455fde7e28 100644 (file)
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -59,7 +59,7 @@ static int dpm_mrc(struct target *target, int cpnum,
                        ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2),
                        value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -82,7 +82,7 @@ static int dpm_mrrc(struct target *target, int cpnum,
                        ARMV5_T_MRRC(cpnum, op, 0, 1, crm),
                        value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -107,7 +107,7 @@ static int dpm_mcr(struct target *target, int cpnum,
                        ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2),
                        value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -129,7 +129,7 @@ static int dpm_mcrr(struct target *target, int cpnum,
        retval = dpm->instr_write_data_r0_r1(dpm,
                        ARMV5_T_MCRR(cpnum, op, 0, 1, crm), value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 
        return retval;
 }
@@ -422,7 +422,7 @@ int arm_dpm_read_current_registers(struct arm_dpm *dpm)
         */
 
 fail:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -632,7 +632,7 @@ int arm_dpm_write_dirty_registers(struct arm_dpm *dpm, bool bpwp)
                cache->reg_list[i].dirty = false;
        }
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 done:
        return retval;
 }
@@ -719,10 +719,10 @@ static int arm_dpm_read_core_reg(struct target *target, struct reg *r,
        /* always clean up, regardless of error */
 
        if (mode != ARM_MODE_ANY)
-               /* (void) */ arm_dpm_modeswitch(dpm, ARM_MODE_ANY);
+               arm_dpm_modeswitch(dpm, ARM_MODE_ANY);
 
 fail:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -761,10 +761,10 @@ static int arm_dpm_write_core_reg(struct target *target, struct reg *r,
        /* always clean up, regardless of error */
 
        if (mode != ARM_MODE_ANY)
-               /* (void) */ arm_dpm_modeswitch(dpm, ARM_MODE_ANY);
+               arm_dpm_modeswitch(dpm, ARM_MODE_ANY);
 
 fail:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -831,7 +831,7 @@ static int arm_dpm_full_context(struct target *target)
        } while (did_read);
 
        retval = arm_dpm_modeswitch(dpm, ARM_MODE_ANY);
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 done:
        return retval;
 }

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index dc3752e0b0ac3f912f485b87dbb983e2842892e4..e22d309a076d33b18897f5768ae2b56492228760 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -74,7 +74,7 @@ static void armv7a_show_fault_registers(struct target *target)
                ", IFAR: %8.8" PRIx32, ifsr, ifar);
 
 done:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 }
 
 

diff --git a/src/target/armv8.c b/src/target/armv8.c
index 3bf09427591752c49a4bc3c2ce0ed3923cf94bc2..61d72741a9e0b00fd9afec9c8b9156857e4fdecd 100644 (file)
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1010,7 +1010,7 @@ static void armv8_show_fault_registers32(struct armv8_common *armv8)
                ", IFAR: %8.8" PRIx32, ifsr, ifar);
 
 done:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 }
 
 static __attribute__((unused)) void armv8_show_fault_registers(struct target *target)

diff --git a/src/target/armv8_dpm.c b/src/target/armv8_dpm.c
index 22617fd0ec1ddf8109bec7636f1fa9f23b459489..d1cee8a10c2811c9f20714bd8dc001a69873c169 100644 (file)
--- a/src/target/armv8_dpm.c
+++ b/src/target/armv8_dpm.c
@@ -500,7 +500,7 @@ static int dpmv8_mrc(struct target *target, int cpnum,
                        ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2),
                        value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -525,7 +525,7 @@ static int dpmv8_mcr(struct target *target, int cpnum,
                        ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2),
                        value);
 
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -991,7 +991,7 @@ static int armv8_dpm_read_core_reg(struct target *target, struct reg *r,
                goto fail;
 
 fail:
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
        return retval;
 }
 
@@ -1085,7 +1085,7 @@ static int armv8_dpm_full_context(struct target *target)
        } while (did_read);
 
        retval = armv8_dpm_modeswitch(dpm, ARM_MODE_ANY);
-       /* (void) */ dpm->finish(dpm);
+       dpm->finish(dpm);
 done:
        return retval;
 }