michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: gsm: remove mux_enabled flag and checks

Browse source 
mux_enabled check in the gsm_configure is unnecessary since it
is init and scheduled by gsm_ppp_start which means that the
mux must be disabled. The IS_ENABLED(CONFIG_GSM_MUX) check
should be good enough to determine whether or not the
mux_enable function should be ran.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2022-03-05 00:21:58 +08:00 • committed by Carles Cufí
commit c7267dc26a
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/modem/gsm_ppp.c
View file

@ -107,7 +107,6 @@ static struct gsm_modem {
int register_retries;
int rssi_retries;
int attach_retries;
bool mux_enabled : 1;
bool attached : 1;
bool modem_info_queried : 1;
@ -1071,7 +1070,6 @@ static void mux_setup(struct k_work *work)
goto unlock;
fail:
gsm->state = STATE_INIT;
gsm->mux_enabled = false;
unlock:
gsm_ppp_unlock(gsm);
}
@ -1102,15 +1100,13 @@ static void gsm_configure(struct k_work *work)
goto reschedule;
}
if (IS_ENABLED(CONFIG_GSM_MUX) && ret == 0 &&
gsm->mux_enabled == false) {
if (IS_ENABLED(CONFIG_GSM_MUX)) {
if (mux_enable(gsm)) {
LOG_DBG("GSM muxing %s", "disabled");
goto reschedule;
}
LOG_DBG("GSM muxing %s", "enabled");
gsm->mux_enabled = true;
gsm->state = STATE_INIT;
@ -1164,8 +1160,6 @@ void gsm_ppp_stop(const struct device *dev)
(void)k_sem_take(&gsm->sem_if_down, K_FOREVER);
if (IS_ENABLED(CONFIG_GSM_MUX)) {
/* Lower mux_enabled flag to trigger re-sending AT+CMUX etc */
gsm->mux_enabled = false;
if (gsm->ppp_dev) {
uart_mux_disable(gsm->ppp_dev);