This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17938 ) Change subject: oc2g: Fix returning values on void function ...................................................................... oc2g: Fix returning values on void function Similar to what's done in I7a944c0636933c0389db9aabd8b5e6c173052f12 for lc15. Change-Id: I6f5e976969af994011bc9282ede115606f0f0d20 --- M src/osmo-bts-oc2g/l1_if.c 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c index b46c528..6b482b7 100644 --- a/src/osmo-bts-oc2g/l1_if.c +++ b/src/osmo-bts-oc2g/l1_if.c @@ -1671,7 +1671,7 @@ msgb_free(resp); } -static int dsp_alive_timer_cb(void *data) +static void dsp_alive_timer_cb(void *data) { struct oc2gl1_hdl *fl1h = data; struct gsm_bts_trx *trx = fl1h->phy_inst->trx; @@ -1706,7 +1706,7 @@ /* allocate new list of sent alarms */ alarm_sent = talloc_zero(fl1h, struct oml_alarm_list); if (!alarm_sent) - return -EIO; + return; alarm_sent->alarm_signal = S_NM_OML_BTS_DSP_ALIVE_ALARM; /* add alarm to sent list */ @@ -1722,14 +1722,14 @@ rc = l1if_req_compl(fl1h, msg, dsp_alive_compl_cb, NULL); if (rc < 0) { LOGP(DL1C, LOGL_FATAL, "Failed to send %s primitive\n", get_value_string(oc2gbts_sysprim_names, sys_prim->id)); - return -EIO; + return; } /* restart timer */ fl1h->hw_alive.dsp_alive_cnt = 0; osmo_timer_schedule(&fl1h->hw_alive.dsp_alive_timer, fl1h->hw_alive.dsp_alive_period, 0); - return 0; + return; } #endif @@ -1793,8 +1793,7 @@ } / * initialize DSP heart beat alive timer * / - fl1h->hw_alive.dsp_alive_timer.cb = dsp_alive_timer_cb; - fl1h->hw_alive.dsp_alive_timer.data = fl1h; + osmo_timer_setup(&fl1h->hw_alive.dsp_alive_timer, dsp_alive_timer_cb, fl1h); fl1h->hw_alive.dsp_alive_cnt = 0; fl1h->hw_alive.dsp_alive_period = pinst->u.oc2g.dsp_alive_period; osmo_timer_schedule(&fl1h->hw_alive.dsp_alive_timer, fl1h->hw_alive.dsp_alive_period, 0); */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f5e976969af994011bc9282ede115606f0f0d20 Gerrit-Change-Number: 17938 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200425/5e82ccf0/attachment.htm>