diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-24 23:17:26 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-04-25 13:51:16 +0000 |
| commit | fd6584b179918ad6e24dd2a424d7a2f0d037ceab (patch) | |
| tree | 0fc56d265069c5981aac0e99b4261320c41483a9 /src/osmo-bts-oc2g | |
| parent | 5a618186a1ac5b487d00bd69b27c4a0c866e4ba1 (diff) | |
oc2g: Fix returning values on void function
Similar to what's done in I7a944c0636933c0389db9aabd8b5e6c173052f12 for
lc15.
Change-Id: I6f5e976969af994011bc9282ede115606f0f0d20
Diffstat (limited to 'src/osmo-bts-oc2g')
| -rw-r--r-- | src/osmo-bts-oc2g/l1_if.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c index b46c528a..6b482b75 100644 --- a/src/osmo-bts-oc2g/l1_if.c +++ b/src/osmo-bts-oc2g/l1_if.c @@ -1671,7 +1671,7 @@ static void dsp_alive_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp, void 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 @@ static int dsp_alive_timer_cb(void *data) /* 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 @@ static int dsp_alive_timer_cb(void *data) 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 @@ int bts_model_phy_link_open(struct phy_link *plink) } / * 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); */ |