drivers: modem: rote conversion of k_work API
Replace all existing deprecated API with the recommended alternative.
Be aware that this does not address architectural errors in the use
of the work API.
Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
diff --git a/drivers/modem/gsm_ppp.c b/drivers/modem/gsm_ppp.c
index 2f56d3d..84ad80b 100644
--- a/drivers/modem/gsm_ppp.c
+++ b/drivers/modem/gsm_ppp.c
@@ -51,7 +51,7 @@
struct k_sem sem_response;
struct modem_iface_uart_data gsm_data;
- struct k_delayed_work gsm_configure_work;
+ struct k_work_delayable gsm_configure_work;
char gsm_rx_rb_buf[PPP_MRU * 3];
uint8_t *ppp_recv_buf;
@@ -368,8 +368,8 @@
if (ret < 0) {
LOG_ERR("modem setup returned %d, %s",
ret, "retrying...");
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_SECONDS(1));
+ (void)k_work_reschedule(&gsm->gsm_configure_work,
+ K_SECONDS(1));
return;
}
}
@@ -395,8 +395,7 @@
if (ret < 0) {
LOG_DBG("modem setup returned %d, %s",
ret, "retrying...");
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_SECONDS(1));
+ (void)k_work_reschedule(&gsm->gsm_configure_work, K_SECONDS(1));
return;
}
@@ -422,8 +421,9 @@
}
LOG_DBG("Not attached, %s", "retrying...");
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_MSEC(GSM_ATTACH_RETRY_DELAY_MSEC));
+
+ (void)k_work_reschedule(&gsm->gsm_configure_work,
+ K_MSEC(GSM_ATTACH_RETRY_DELAY_MSEC));
return;
}
@@ -441,8 +441,7 @@
if (ret < 0) {
LOG_DBG("modem setup returned %d, %s",
ret, "retrying...");
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_SECONDS(1));
+ (void)k_work_reschedule(&gsm->gsm_configure_work, K_SECONDS(1));
return;
}
@@ -523,7 +522,7 @@
static void mux_setup_next(struct gsm_modem *gsm)
{
- (void)k_delayed_work_submit(&gsm->gsm_configure_work, K_MSEC(1));
+ (void)k_work_reschedule(&gsm->gsm_configure_work, K_MSEC(1));
}
static void mux_attach_cb(const struct device *mux, int dlci_address,
@@ -674,8 +673,7 @@
if (ret < 0) {
LOG_DBG("modem not ready %d", ret);
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_NO_WAIT);
+ (void)k_work_reschedule(&gsm->gsm_configure_work, K_NO_WAIT);
return;
}
@@ -689,8 +687,8 @@
gsm->mux_enabled = true;
} else {
gsm->mux_enabled = false;
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_NO_WAIT);
+ (void)k_work_reschedule(&gsm->gsm_configure_work,
+ K_NO_WAIT);
return;
}
@@ -700,11 +698,11 @@
if (gsm->mux_enabled) {
gsm->state = STATE_INIT;
- k_delayed_work_init(&gsm->gsm_configure_work,
- mux_setup);
+ k_work_init_delayable(&gsm->gsm_configure_work,
+ mux_setup);
- (void)k_delayed_work_submit(&gsm->gsm_configure_work,
- K_NO_WAIT);
+ (void)k_work_reschedule(&gsm->gsm_configure_work,
+ K_NO_WAIT);
return;
}
}
@@ -724,8 +722,8 @@
return;
}
- k_delayed_work_init(&gsm->gsm_configure_work, gsm_configure);
- (void)k_delayed_work_submit(&gsm->gsm_configure_work, K_NO_WAIT);
+ k_work_init_delayable(&gsm->gsm_configure_work, gsm_configure);
+ (void)k_work_reschedule(&gsm->gsm_configure_work, K_NO_WAIT);
}
void gsm_ppp_stop(const struct device *dev)
diff --git a/drivers/modem/quectel-bg9x.c b/drivers/modem/quectel-bg9x.c
index 8081908..dc3f8b5 100644
--- a/drivers/modem/quectel-bg9x.c
+++ b/drivers/modem/quectel-bg9x.c
@@ -896,9 +896,9 @@
/* Re-start RSSI query work */
if (work) {
- k_delayed_work_submit_to_queue(&modem_workq,
- &mdata.rssi_query_work,
- K_SECONDS(RSSI_TIMEOUT_SECS));
+ k_work_reschedule_for_queue(&modem_workq,
+ &mdata.rssi_query_work,
+ K_SECONDS(RSSI_TIMEOUT_SECS));
}
}
@@ -1019,7 +1019,7 @@
counter = 0;
/* stop RSSI delay work */
- k_delayed_work_cancel(&mdata.rssi_query_work);
+ k_work_cancel_delayable(&mdata.rssi_query_work);
/* Let the modem respond. */
LOG_INF("Waiting for modem to respond");
@@ -1068,9 +1068,8 @@
/* Network is ready - Start RSSI work in the background. */
LOG_INF("Network is ready.");
- k_delayed_work_submit_to_queue(&modem_workq,
- &mdata.rssi_query_work,
- K_SECONDS(RSSI_TIMEOUT_SECS));
+ k_work_reschedule_for_queue(&modem_workq, &mdata.rssi_query_work,
+ K_SECONDS(RSSI_TIMEOUT_SECS));
/* Once the network is ready, we try to activate the PDP context. */
ret = modem_pdp_context_activate();
@@ -1145,9 +1144,9 @@
k_sem_init(&mdata.sem_response, 0, 1);
k_sem_init(&mdata.sem_tx_ready, 0, 1);
k_sem_init(&mdata.sem_sock_conn, 0, 1);
- k_work_q_start(&modem_workq, modem_workq_stack,
- K_KERNEL_STACK_SIZEOF(modem_workq_stack),
- K_PRIO_COOP(7));
+ k_work_queue_start(&modem_workq, modem_workq_stack,
+ K_KERNEL_STACK_SIZEOF(modem_workq_stack),
+ K_PRIO_COOP(7), NULL);
/* socket config */
mdata.socket_config.sockets = &mdata.sockets[0];
@@ -1210,7 +1209,7 @@
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
/* Init RSSI query */
- k_delayed_work_init(&mdata.rssi_query_work, modem_rssi_query_work);
+ k_work_init_delayable(&mdata.rssi_query_work, modem_rssi_query_work);
return modem_setup();
error:
diff --git a/drivers/modem/quectel-bg9x.h b/drivers/modem/quectel-bg9x.h
index 545ca5b..43e8249 100644
--- a/drivers/modem/quectel-bg9x.h
+++ b/drivers/modem/quectel-bg9x.h
@@ -89,7 +89,7 @@
struct modem_socket sockets[MDM_MAX_SOCKETS];
/* RSSI work */
- struct k_delayed_work rssi_query_work;
+ struct k_work_delayable rssi_query_work;
/* modem data */
char mdm_manufacturer[MDM_MANUFACTURER_LENGTH];
diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
index 2264a7f..32bbf6b 100644
--- a/drivers/modem/ublox-sara-r4.c
+++ b/drivers/modem/ublox-sara-r4.c
@@ -141,7 +141,7 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* RSSI work */
- struct k_delayed_work rssi_query_work;
+ struct k_work_delayable rssi_query_work;
#endif
/* modem data */
@@ -924,8 +924,8 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* re-start RSSI query work */
if (work) {
- k_delayed_work_submit_to_queue(&modem_workq,
- &mdata.rssi_query_work,
+ k_work_reschedule_for_queue(
+ &modem_workq, &mdata.rssi_query_work,
K_SECONDS(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK_PERIOD));
}
#endif
@@ -954,9 +954,9 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* re-start RSSI query work */
if (work) {
- k_delayed_work_submit_to_queue(&modem_workq,
- &mdata.rssi_query_work,
- K_SECONDS(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK_PERIOD));
+ k_work_reschedule_for_queue(
+ &modem_workq, &mdata.rssi_query_work,
+ K_SECONDS(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK_PERIOD));
}
#endif
}
@@ -1039,7 +1039,7 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* stop RSSI delay work */
- k_delayed_work_cancel(&mdata.rssi_query_work);
+ k_work_cancel_delayable(&mdata.rssi_query_work);
#endif
pin_init();
@@ -1208,9 +1208,9 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* start RSSI query */
- k_delayed_work_submit_to_queue(&modem_workq,
- &mdata.rssi_query_work,
- K_SECONDS(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK_PERIOD));
+ k_work_reschedule_for_queue(
+ &modem_workq, &mdata.rssi_query_work,
+ K_SECONDS(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK_PERIOD));
#endif
error:
@@ -1839,10 +1839,9 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* initialize the work queue */
- k_work_q_start(&modem_workq,
- modem_workq_stack,
- K_KERNEL_STACK_SIZEOF(modem_workq_stack),
- K_PRIO_COOP(7));
+ k_work_queue_start(&modem_workq, modem_workq_stack,
+ K_KERNEL_STACK_SIZEOF(modem_workq_stack),
+ K_PRIO_COOP(7), NULL);
#endif
/* socket config */
@@ -1908,7 +1907,7 @@
#if defined(CONFIG_MODEM_UBLOX_SARA_RSSI_WORK)
/* init RSSI query */
- k_delayed_work_init(&mdata.rssi_query_work, modem_rssi_query_work);
+ k_work_init_delayable(&mdata.rssi_query_work, modem_rssi_query_work);
#endif
modem_reset();
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index cf18b3b..284a08d 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -197,7 +197,7 @@
struct k_sem response_sem;
/* RSSI work */
- struct k_delayed_work rssi_query_work;
+ struct k_work_delayable rssi_query_work;
/* modem data */
char mdm_manufacturer[MDM_MANUFACTURER_LENGTH];
@@ -1322,9 +1322,8 @@
}
/* re-start RSSI query work */
- k_delayed_work_submit_to_queue(&wncm14a2a_workq,
- &ictx.rssi_query_work,
- K_SECONDS(RSSI_TIMEOUT_SECS));
+ k_work_reschedule_for_queue(&wncm14a2a_workq, &ictx.rssi_query_work,
+ K_SECONDS(RSSI_TIMEOUT_SECS));
}
static void wncm14a2a_modem_reset(void)
@@ -1336,7 +1335,7 @@
restart:
/* stop RSSI delay work */
- k_delayed_work_cancel(&ictx.rssi_query_work);
+ k_work_cancel_delayable(&ictx.rssi_query_work);
modem_pin_init();
@@ -1402,7 +1401,7 @@
(ictx.mdm_ctx.data_rssi <= -1000 ||
ictx.mdm_ctx.data_rssi == 0)) {
/* stop RSSI delay work */
- k_delayed_work_cancel(&ictx.rssi_query_work);
+ k_work_cancel_delayable(&ictx.rssi_query_work);
wncm14a2a_rssi_query_work(NULL);
k_sleep(K_SECONDS(2));
}
@@ -1460,10 +1459,9 @@
k_sem_init(&ictx.response_sem, 0, 1);
/* initialize the work queue */
- k_work_q_start(&wncm14a2a_workq,
- wncm14a2a_workq_stack,
- K_KERNEL_STACK_SIZEOF(wncm14a2a_workq_stack),
- K_PRIO_COOP(7));
+ k_work_queue_start(&wncm14a2a_workq, wncm14a2a_workq_stack,
+ K_KERNEL_STACK_SIZEOF(wncm14a2a_workq_stack),
+ K_PRIO_COOP(7), NULL);
ictx.last_socket_id = 0;
@@ -1503,7 +1501,7 @@
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
/* init RSSI query */
- k_delayed_work_init(&ictx.rssi_query_work, wncm14a2a_rssi_query_work);
+ k_work_init_delayable(&ictx.rssi_query_work, wncm14a2a_rssi_query_work);
wncm14a2a_modem_reset();
