From f0a8eed7e833f68b708b19378c9adb5e2e4482d1 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 24 Sep 2018 17:38:37 +0200 Subject: cosmetic: drop param from send_assignment_complete() After previous patch I8dd561d744d8081b5ac5ffa7635f17ac19bcda45, all callers pass conn->lchan to send_assignment_complete(), so there is no need to pass it separately from conn. Change-Id: I3c038d91a53c81d9fcf4ec62f853b59bb1ecd244 --- src/osmo-bsc/assignment_fsm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 1c4e6fdfc..4dc2fd96e 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -129,7 +129,7 @@ static void on_assignment_failure(struct gsm_subscriber_connection *conn) } } -static void send_assignment_complete(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan) +static void send_assignment_complete(struct gsm_subscriber_connection *conn) { int rc; struct gsm0808_speech_codec sc; @@ -139,7 +139,7 @@ static void send_assignment_complete(struct gsm_subscriber_connection *conn, str int perm_spch = 0; uint8_t chosen_channel; struct msgb *resp; - struct gsm_lchan *lchan = new_lchan; + struct gsm_lchan *lchan = conn->lchan; struct osmo_fsm_inst *fi = conn->fi; chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode); @@ -207,7 +207,7 @@ static void assignment_success(struct gsm_subscriber_connection *conn) /* apply LCLS configuration (if any) */ lcls_apply_config(conn); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); /* If something went wrong during send_assignment_complete(), the fi will be gone from * error handling in there. Almost a success, but then again the whole thing failed. */ if (!conn->assignment.fi) { @@ -348,7 +348,7 @@ void assignment_fsm_start(struct gsm_subscriber_connection *conn, struct gsm_bts " requested chan_mode=%s; current lchan is %s\n", gsm48_chan_mode_name(req->chan_mode), gsm_lchan_name(conn->lchan)); - send_assignment_complete(conn, conn->lchan); + send_assignment_complete(conn); return; } -- cgit v1.2.3