breakpoints: simplify the test to find a breakpoint

[openocd] / src / target / breakpoints.c

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 7cf4a6957e13e082114a4f03ca788ed808431dc7..58bcc8615906d59de807ba6c192b522dbcb6d86a 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -315,11 +315,8 @@ int breakpoint_remove_internal(struct target *target, target_addr_t address)
        struct breakpoint *breakpoint = target->breakpoints;
 
        while (breakpoint) {
-               if ((breakpoint->address == address) && (breakpoint->asid == 0))
-                       break;
-               else if ((breakpoint->address == 0) && (breakpoint->asid == address))
-                       break;
-               else if ((breakpoint->address == address) && (breakpoint->asid != 0))
+               if ((breakpoint->address == address) ||
+                   (breakpoint->address == 0 && breakpoint->asid == address))
                        break;
                breakpoint = breakpoint->next;
        }