<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17938">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oc2g: Fix returning values on void function<br><br>Similar to what's done in I7a944c0636933c0389db9aabd8b5e6c173052f12 for<br>lc15.<br><br>Change-Id: I6f5e976969af994011bc9282ede115606f0f0d20<br>---<br>M src/osmo-bts-oc2g/l1_if.c<br>1 file changed, 5 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/17938/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index b46c528..6b482b7 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -1671,7 +1671,7 @@</span><br><span>      msgb_free(resp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int dsp_alive_timer_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void dsp_alive_timer_cb(void *data)</span><br><span> {</span><br><span>  struct oc2gl1_hdl *fl1h = data;</span><br><span>      struct gsm_bts_trx *trx = fl1h->phy_inst->trx;</span><br><span>@@ -1706,7 +1706,7 @@</span><br><span>                                 /* allocate new list of sent alarms */</span><br><span>                               alarm_sent = talloc_zero(fl1h, struct oml_alarm_list);</span><br><span>                               if (!alarm_sent)</span><br><span style="color: hsl(0, 100%, 40%);">-                                        return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+                                  return;</span><br><span> </span><br><span>                          alarm_sent->alarm_signal = S_NM_OML_BTS_DSP_ALIVE_ALARM;</span><br><span>                          /* add alarm to sent list */</span><br><span>@@ -1722,14 +1722,14 @@</span><br><span>       rc = l1if_req_compl(fl1h, msg, dsp_alive_compl_cb, NULL);</span><br><span>    if (rc < 0) {</span><br><span>             LOGP(DL1C, LOGL_FATAL, "Failed to send %s primitive\n", get_value_string(oc2gbts_sysprim_names, sys_prim->id));</span><br><span style="color: hsl(0, 100%, 40%);">-            return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+          return;</span><br><span>      }</span><br><span> </span><br><span>        /* restart timer */</span><br><span>  fl1h->hw_alive.dsp_alive_cnt = 0;</span><br><span>         osmo_timer_schedule(&fl1h->hw_alive.dsp_alive_timer, fl1h->hw_alive.dsp_alive_period, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return;</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span>@@ -1793,8 +1793,7 @@</span><br><span>   }</span><br><span> </span><br><span>        / * initialize DSP heart beat alive timer * /</span><br><span style="color: hsl(0, 100%, 40%);">-   fl1h->hw_alive.dsp_alive_timer.cb = dsp_alive_timer_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-      fl1h->hw_alive.dsp_alive_timer.data = fl1h;</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_timer_setup(&fl1h->hw_alive.dsp_alive_timer, dsp_alive_timer_cb, fl1h);</span><br><span>  fl1h->hw_alive.dsp_alive_cnt = 0;</span><br><span>         fl1h->hw_alive.dsp_alive_period = pinst->u.oc2g.dsp_alive_period;</span><br><span>      osmo_timer_schedule(&fl1h->hw_alive.dsp_alive_timer, fl1h->hw_alive.dsp_alive_period, 0); */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17938">change 17938</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/+/17938"/><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: I6f5e976969af994011bc9282ede115606f0f0d20 </div>
<div style="display:none"> Gerrit-Change-Number: 17938 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>