michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: gsm: remove use of preprocessor directives for rssi

Browse source 
The rssi_work_handle always exists in the gsm struct, so use

```
if (IS_ENABLED(CONFIG_GSM_MUX))
```
instead of

```
#if defined(CONFIG_GSM_MUX)
```

for better code readability.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2022-02-20 16:16:30 +08:00 • committed by Carles Cufí
commit 7a6764987e
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/modem/gsm_ppp.c
View file

@ -588,14 +588,13 @@ static void rssi_handler(struct k_work *work)
LOG_DBG("No answer to RSSI readout, %s", "ignoring..."); LOG_DBG("No answer to RSSI readout, %s", "ignoring...");
} }
#if defined(CONFIG_GSM_MUX) if (IS_ENABLED(CONFIG_GSM_MUX)) {
#if defined(CONFIG_MODEM_CELL_INFO) #if defined(CONFIG_MODEM_CELL_INFO)
(void)gsm_query_cellinfo(gsm); (void)gsm_query_cellinfo(gsm);
#endif #endif
(void)gsm_work_reschedule(&gsm->rssi_work_handle, (void)gsm_work_reschedule(&gsm->rssi_work_handle,
K_SECONDS(CONFIG_MODEM_GSM_RSSI_POLLING_PERIOD)); K_SECONDS(CONFIG_MODEM_GSM_RSSI_POLLING_PERIOD));
#endif }
} }
static void gsm_finalize_connection(struct k_work *work) static void gsm_finalize_connection(struct k_work *work)
@ -1179,9 +1178,9 @@ static int gsm_init(const struct device *dev)
K_PRIO_COOP(7), NULL); K_PRIO_COOP(7), NULL);
k_thread_name_set(&gsm->workq.thread, "gsm_workq"); k_thread_name_set(&gsm->workq.thread, "gsm_workq");
#if defined(CONFIG_GSM_MUX) if (IS_ENABLED(CONFIG_GSM_MUX)) {
k_work_init_delayable(&gsm->rssi_work_handle, rssi_handler); k_work_init_delayable(&gsm->rssi_work_handle, rssi_handler);
#endif }
gsm->iface = ppp_net_if(); gsm->iface = ppp_net_if();
if (!gsm->iface) { if (!gsm->iface) {