<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25941">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag<br><br>With this change the error case is moved at the end of the function,<br>which is more usual. At the same time, one goto tag can be removed,<br>simplifying the function.<br><br>This is also a preparation for next patch improvinga bit the logic<br>around same place.<br><br>Related: SYS#5676<br>Related: SYS#4919<br>Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8<br>---<br>M src/osmo-bts-trx/sched_lchan_pdtch.c<br>1 file changed, 11 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>index 17523e1..4c63acb 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>@@ -161,20 +161,11 @@</span><br><span> </span><br><span>    /* get mac block from queue */</span><br><span>       msg = _sched_dequeue_prim(l1ts, br);</span><br><span style="color: hsl(0, 100%, 40%);">-    if (msg)</span><br><span style="color: hsl(0, 100%, 40%);">-                goto got_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-no_msg:</span><br><span style="color: hsl(0, 100%, 40%);">- /* free burst memory */</span><br><span style="color: hsl(0, 100%, 40%);">- if (*bursts_p) {</span><br><span style="color: hsl(0, 100%, 40%);">-                talloc_free(*bursts_p);</span><br><span style="color: hsl(0, 100%, 40%);">-         *bursts_p = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (!msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+              goto no_msg;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       return -ENODEV;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-got_msg:</span><br><span>  /* BURST BYPASS */</span><br><span> </span><br><span>       /* allocate burst memory, if not already */</span><br><span>@@ -229,4 +220,12 @@</span><br><span>   LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting burst=%u.\n", br->bid);</span><br><span> </span><br><span>   return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+no_msg:</span><br><span style="color: hsl(120, 100%, 40%);">+  /* free burst memory */</span><br><span style="color: hsl(120, 100%, 40%);">+       if (*bursts_p) {</span><br><span style="color: hsl(120, 100%, 40%);">+              talloc_free(*bursts_p);</span><br><span style="color: hsl(120, 100%, 40%);">+               *bursts_p = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+     return -ENODEV;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25941">change 25941</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/25941"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 </div>
<div style="display:none"> Gerrit-Change-Number: 25941 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>