From 386c33fa847d9f00937c43005bf6f949536cffbb Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 9 Sep 2018 10:01:48 +0200 Subject: CBCH: Use llist_first_entry_or_null() instead of reinventing it Change-Id: I376111e71d1c7be35a8fd7e392488adc34e21941 --- src/common/cbch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/cbch.c b/src/common/cbch.c index b8f69c62..56d76f17 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -144,12 +144,10 @@ static struct smscb_msg *select_next_smscb(struct gsm_bts *bts) { struct smscb_msg *msg; - if (llist_empty(&bts->smscb_state.queue)) + msg = llist_first_entry_or_null(&bts->smscb_state.queue, struct smscb_msg, list); + if (!msg) return NULL; - msg = llist_entry(bts->smscb_state.queue.next, - struct smscb_msg, list); - llist_del(&msg->list); return msg; -- cgit v1.2.3