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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lc15: Fix returning values on void function<br><br>Fixes following warnings:<br>/osmo-bts/src/osmo-bts-litecell15/l1_if.c:1722:36: warning: assignment to ‘void (*)(void *)’ from incompatible pointer type ‘int (*)(void *)’ [-Wincompatible-pointer-types]<br> 1722 |  fl1h->hw_alive.dsp_alive_timer.cb = dsp_alive_timer_cb;<br>      |                                    ^<br><br>Change-Id: I7a944c0636933c0389db9aabd8b5e6c173052f12<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>1 file changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 6dead92..0e334d2 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -1618,7 +1618,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 lc15l1_hdl *fl1h = data;</span><br><span>      struct gsm_bts_trx *trx = fl1h->phy_inst->trx;</span><br><span>@@ -1643,14 +1643,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(lc15bts_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>@@ -1719,8 +1719,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.lc15.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/+/17936">change 17936</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/+/17936"/><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: I7a944c0636933c0389db9aabd8b5e6c173052f12 </div>
<div style="display:none"> Gerrit-Change-Number: 17936 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: rafael2k <rafael@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>