drivers: wifi: 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>
diff --git a/drivers/wifi/esp/esp.c b/drivers/wifi/esp/esp.c
index c13b6f5..f08dddf 100644
--- a/drivers/wifi/esp/esp.c
+++ b/drivers/wifi/esp/esp.c
@@ -443,8 +443,8 @@
ESP_CMD_TIMEOUT);
if (ret < 0) {
LOG_WRN("Failed to query IP settings: ret %d", ret);
- k_delayed_work_submit_to_queue(&dev->workq, &dev->ip_addr_work,
- K_SECONDS(5));
+ k_work_reschedule_for_queue(&dev->workq, &dev->ip_addr_work,
+ K_SECONDS(5));
return;
}
@@ -471,8 +471,8 @@
struct esp_data *dev = CONTAINER_OF(data, struct esp_data,
cmd_handler_data);
- k_delayed_work_submit_to_queue(&dev->workq, &dev->ip_addr_work,
- K_SECONDS(1));
+ k_work_reschedule_for_queue(&dev->workq, &dev->ip_addr_work,
+ K_SECONDS(1));
return 0;
}
@@ -1087,7 +1087,7 @@
k_sem_init(&data->sem_if_up, 0, 1);
k_work_init(&data->init_work, esp_init_work);
- k_delayed_work_init(&data->ip_addr_work, esp_ip_addr_work);
+ k_work_init_delayable(&data->ip_addr_work, esp_ip_addr_work);
k_work_init(&data->scan_work, esp_mgmt_scan_work);
k_work_init(&data->connect_work, esp_mgmt_connect_work);
k_work_init(&data->mode_switch_work, esp_mode_switch_work);
@@ -1098,9 +1098,10 @@
esp_socket_init(data);
/* initialize the work queue */
- k_work_q_start(&data->workq, esp_workq_stack,
- K_KERNEL_STACK_SIZEOF(esp_workq_stack),
- K_PRIO_COOP(CONFIG_WIFI_ESP_WORKQ_THREAD_PRIORITY));
+ k_work_queue_start(&data->workq, esp_workq_stack,
+ K_KERNEL_STACK_SIZEOF(esp_workq_stack),
+ K_PRIO_COOP(CONFIG_WIFI_ESP_WORKQ_THREAD_PRIORITY),
+ NULL);
k_thread_name_set(&data->workq.thread, "esp_workq");
/* cmd handler */
diff --git a/drivers/wifi/esp/esp.h b/drivers/wifi/esp/esp.h
index 3900082..493c219 100644
--- a/drivers/wifi/esp/esp.h
+++ b/drivers/wifi/esp/esp.h
@@ -218,7 +218,7 @@
/* work */
struct k_work_q workq;
struct k_work init_work;
- struct k_delayed_work ip_addr_work;
+ struct k_work_delayable ip_addr_work;
struct k_work scan_work;
struct k_work connect_work;
struct k_work mode_switch_work;
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
index 74a3fb0..70584d4 100644
--- a/drivers/wifi/eswifi/eswifi_core.c
+++ b/drivers/wifi/eswifi/eswifi_core.c
@@ -669,9 +669,9 @@
DT_INST_GPIO_FLAGS(0, wakeup_gpios) |
GPIO_OUTPUT_ACTIVE);
- k_work_q_start(&eswifi->work_q, eswifi_work_q_stack,
- K_KERNEL_STACK_SIZEOF(eswifi_work_q_stack),
- CONFIG_SYSTEM_WORKQUEUE_PRIORITY - 1);
+ k_work_queue_start(&eswifi->work_q, eswifi_work_q_stack,
+ K_KERNEL_STACK_SIZEOF(eswifi_work_q_stack),
+ CONFIG_SYSTEM_WORKQUEUE_PRIORITY - 1, NULL);
k_work_init(&eswifi->request_work, eswifi_request_work);
diff --git a/drivers/wifi/eswifi/eswifi_offload.c b/drivers/wifi/eswifi/eswifi_offload.c
index cb317c0..ab699a1 100644
--- a/drivers/wifi/eswifi/eswifi_offload.c
+++ b/drivers/wifi/eswifi/eswifi_offload.c
@@ -433,8 +433,8 @@
k_sem_init(&socket->read_sem, 1, 1);
k_sem_init(&socket->accept_sem, 1, 1);
- k_delayed_work_submit_to_queue(&eswifi->work_q, &socket->read_work,
- K_MSEC(500));
+ k_work_reschedule_for_queue(&eswifi->work_q, &socket->read_work,
+ K_MSEC(500));
unlock:
eswifi_unlock(eswifi);
diff --git a/drivers/wifi/eswifi/eswifi_offload.h b/drivers/wifi/eswifi/eswifi_offload.h
index 380f58b..91e0ce4 100644
--- a/drivers/wifi/eswifi/eswifi_offload.h
+++ b/drivers/wifi/eswifi/eswifi_offload.h
@@ -42,7 +42,7 @@
struct net_pkt *tx_pkt;
struct k_work connect_work;
struct k_work send_work;
- struct k_delayed_work read_work;
+ struct k_work_delayable read_work;
struct sockaddr peer_addr;
struct k_sem read_sem;
struct k_sem accept_sem;
diff --git a/drivers/wifi/eswifi/eswifi_socket.c b/drivers/wifi/eswifi/eswifi_socket.c
index e31ca0e..612dfa0 100644
--- a/drivers/wifi/eswifi/eswifi_socket.c
+++ b/drivers/wifi/eswifi/eswifi_socket.c
@@ -150,9 +150,8 @@
next_timeout_ms = 0;
done:
- err = k_delayed_work_submit_to_queue(&eswifi->work_q,
- &socket->read_work,
- K_MSEC(next_timeout_ms));
+ err = k_work_reschedule_for_queue(&eswifi->work_q, &socket->read_work,
+ K_MSEC(next_timeout_ms));
if (err) {
LOG_ERR("Rescheduling socket read error");
}
@@ -237,7 +236,7 @@
struct eswifi_off_socket *socket)
{
__select_socket(eswifi, socket->index);
- k_delayed_work_cancel(&socket->read_work);
+ k_work_cancel_delayable(&socket->read_work);
__select_socket(eswifi, socket->index);
__stop_socket(eswifi, socket);
@@ -298,7 +297,7 @@
return -EIO;
}
- k_delayed_work_init(&socket->read_work, eswifi_off_read_work);
+ k_work_init_delayable(&socket->read_work, eswifi_off_read_work);
socket->usage = 1;
LOG_DBG("Socket index %d", socket->index);
diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c
index 787216a..e29c02f 100644
--- a/drivers/wifi/eswifi/eswifi_socket_offload.c
+++ b/drivers/wifi/eswifi/eswifi_socket_offload.c
@@ -410,8 +410,8 @@
socket->recv_cb = __process_received;
socket->recv_data = socket;
- k_delayed_work_submit_to_queue(&eswifi->work_q, &socket->read_work,
- K_MSEC(500));
+ k_work_reschedule_for_queue(&eswifi->work_q, &socket->read_work,
+ K_MSEC(500));
unlock:
eswifi_unlock(eswifi);
diff --git a/drivers/wifi/simplelink/simplelink.c b/drivers/wifi/simplelink/simplelink.c
index 8ee553d..e59aa55 100644
--- a/drivers/wifi/simplelink/simplelink.c
+++ b/drivers/wifi/simplelink/simplelink.c
@@ -32,7 +32,7 @@
unsigned char mac[6];
/* Fields for scan API to emulate an asynchronous scan: */
- struct k_delayed_work work;
+ struct k_work_delayable work;
scan_result_cb_t cb;
int num_results_or_err;
int scan_retries;
@@ -126,7 +126,7 @@
if (delay > 0) {
LOG_DBG("Retrying scan...");
}
- k_delayed_work_submit(&simplelink_data.work, K_MSEC(delay));
+ k_work_reschedule(&simplelink_data.work, K_MSEC(delay));
} else {
/* Encountered an error, or max retries exceeded: */
@@ -143,7 +143,7 @@
int status;
/* Cancel any previous scan processing in progress: */
- k_delayed_work_cancel(&simplelink_data.work);
+ k_work_cancel_delayable(&simplelink_data.work);
/* "Request" the scan: */
err = z_simplelink_start_scan();
@@ -160,7 +160,7 @@
simplelink_data.num_results_or_err = err;
simplelink_data.scan_retries = 0;
- k_delayed_work_submit(&simplelink_data.work, K_MSEC(delay));
+ k_work_reschedule(&simplelink_data.work, K_MSEC(delay));
status = 0;
} else {
status = -EIO;
@@ -274,8 +274,8 @@
ARG_UNUSED(dev);
/* We use system workqueue to deal with scan retries: */
- k_delayed_work_init(&simplelink_data.work,
- simplelink_scan_work_handler);
+ k_work_init_delayable(&simplelink_data.work,
+ simplelink_scan_work_handler);
LOG_DBG("SimpleLink driver Initialized");
