Change in osmocom-bb[master]: trxcon: call osmo_timer_del() unconditionally

[fixeria]

fixeria has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/28719 )


Change subject: trxcon: call osmo_timer_del() unconditionally
......................................................................

trxcon: call osmo_timer_del() unconditionally

osmo_timer_del() does check if a timer is active internally.

Change-Id: I4ede5b19eeb847fe8fdaed52a8b5c801b3de209a
---
M src/host/trxcon/src/l1ctl.c
M src/host/trxcon/src/trx_if.c
M src/host/trxcon/src/trxcon.c
3 files changed, 3 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/28719/1

diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c
index 66ddac1..f8faa97 100644
--- a/src/host/trxcon/src/l1ctl.c
+++ b/src/host/trxcon/src/l1ctl.c
@@ -186,8 +186,7 @@
        trxcon->fbsb_conf_sent = true;

        /* Abort FBSB expire timer */
-       if (osmo_timer_pending(&trxcon->fbsb_timer))
-               osmo_timer_del(&trxcon->fbsb_timer);
+       osmo_timer_del(&trxcon->fbsb_timer);

        return l1ctl_client_send(l1c, msg);
 }
diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c
index f627de8..dd679f2 100644
--- a/src/host/trxcon/src/trx_if.c
+++ b/src/host/trxcon/src/trx_if.c
@@ -504,8 +504,7 @@
        LOGPFSML(trx->fi, LOGL_INFO, "Response message: '%s'\n", buf);

        /* Abort expire timer */
-       if (osmo_timer_pending(&trx->trx_ctrl_timer))
-               osmo_timer_del(&trx->trx_ctrl_timer);
+       osmo_timer_del(&trx->trx_ctrl_timer);

        /* Get command for response message */
        if (llist_empty(&trx->trx_ctrl_list)) {
diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c
index 77f481a..9f672e8 100644
--- a/src/host/trxcon/src/trxcon.c
+++ b/src/host/trxcon/src/trxcon.c
@@ -364,8 +364,7 @@
        if (trxcon->trx != NULL)
                trx_if_close(trxcon->trx);

-       if (osmo_timer_pending(&trxcon->fbsb_timer))
-               osmo_timer_del(&trxcon->fbsb_timer);
+       osmo_timer_del(&trxcon->fbsb_timer);

        if (trxcon->fi != NULL)
                osmo_fsm_inst_free(trxcon->fi);

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28719
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I4ede5b19eeb847fe8fdaed52a8b5c801b3de209a
Gerrit-Change-Number: 28719
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-MessageType: newchange