[PATCH] Remove trivial wrapper function

msuraev at sysmocom.de msuraev at sysmocom.de
Thu Apr 7 09:38:52 UTC 2016


From: Max <msuraev at sysmocom.de>

Rename gsm48_tx_chan_mode_modify() to gsm48_lchan_modify() and remove
corresponding wrapper code.
---
 openbsc/src/libbsc/gsm_04_08_utils.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c
index 8c6dbef..635665a 100644
--- a/openbsc/src/libbsc/gsm_04_08_utils.c
+++ b/openbsc/src/libbsc/gsm_04_08_utils.c
@@ -463,7 +463,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan,
 	/*
 	 * fill the channel information element, this code
 	 * should probably be shared with rsl_rx_chan_rqd(),
-	 * gsm48_tx_chan_mode_modify. But beware that 10.5.2.5
+	 * gsm48_lchan_modify(). But beware that 10.5.2.5
 	 * 10.5.2.5.a have slightly different semantic for
 	 * the chan_desc. But as long as multi-slot configurations
 	 * are not used we seem to be fine.
@@ -488,7 +488,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan,
 }
 
 /* 9.1.5 Channel mode modify: Modify the mode on the MS side */
-int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, uint8_t mode)
+int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t mode)
 {
 	struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CHN MOD");
 	struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
@@ -513,17 +513,6 @@ int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, uint8_t mode)
 	return gsm48_sendmsg(msg);
 }
 
-int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t lchan_mode)
-{
-	int rc;
-
-	rc = gsm48_tx_chan_mode_modify(lchan, lchan_mode);
-	if (rc < 0)
-		return rc;
-
-	return rc;
-}
-
 int gsm48_rx_rr_modif_ack(struct msgb *msg)
 {
 	int rc;
-- 
2.8.1




More information about the OpenBSC mailing list