|
From: openocd-gerrit <ope...@us...> - 2024-10-05 15:50:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 8c23e6c1759be497c1328837fb49992d489b0719 (commit)
from 3ccf68cd0a8aa740565456317bae9d43618ef662 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8c23e6c1759be497c1328837fb49992d489b0719
Author: Antonio Borneo <bor...@gm...>
Date: Mon Sep 16 13:49:04 2024 +0200
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 <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8498
Tested-by: jenkins
Reviewed-by: zapb <de...@za...>
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 318d5afec..0b2db77c5 100644
--- 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 dc3752e0b..e22d309a0 100644
--- 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 3bf094275..61d72741a 100644
--- 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 22617fd0e..d1cee8a10 100644
--- 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;
}
-----------------------------------------------------------------------
Summary of changes:
src/target/arm_dpm.c | 22 +++++++++++-----------
src/target/armv7a.c | 2 +-
src/target/armv8.c | 2 +-
src/target/armv8_dpm.c | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|