coccinelle: standardize kernel API timeout arguments

pabigot · galak · commit ab91eef23b65 · 2019-10-03T11:55:44.000-07:00
Use the int_literal_to_timeout Coccinelle script to convert literal
integer arguments for kernel API timeout parameters to the standard
timeout value representations.

Signed-off-by: Peter Bigot &lt;peter.bigot@nordicsemi.no&gt;
diff --git a/drivers/adc/adc_context.h b/drivers/adc/adc_context.h
@@ -95,7 +95,7 @@ static inline void adc_context_enable_timer(struct adc_context *ctx)
 	u32_t interval_us = ctx->options.interval_us;
 	u32_t interval_ms = ceiling_fraction(interval_us, 1000UL);
 
-	k_timer_start(&ctx->timer, 0, interval_ms);
+	k_timer_start(&ctx->timer, K_NO_WAIT, interval_ms);
 }
 
 static inline void adc_context_disable_timer(struct adc_context *ctx)
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
@@ -635,10 +635,10 @@ static int cc1200_tx(struct device *dev,
 	}
 
 	/* Wait for SYNC to be sent */
-	k_sem_take(&cc1200->tx_sync, 100);
+	k_sem_take(&cc1200->tx_sync, K_MSEC(100));
 	if (atomic_get(&cc1200->tx_start) == 1) {
 		/* Now wait for the packet to be fully sent */
-		k_sem_take(&cc1200->tx_sync, 100);
+		k_sem_take(&cc1200->tx_sync, K_MSEC(100));
 	}
 
 out:
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
@@ -839,7 +839,7 @@ static int cc2520_tx(struct device *dev,
 			goto error;
 		}
 
-		k_sem_take(&cc2520->tx_sync, 10);
+		k_sem_take(&cc2520->tx_sync, K_MSEC(10));
 
 		retry--;
 		status = verify_tx_done(cc2520);
diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
@@ -442,7 +442,7 @@ static int ht16k33_init(struct device *dev)
 
 		/* Setup timer for polling key data */
 		k_timer_init(&data->timer, ht16k33_timer_callback, NULL);
-		k_timer_start(&data->timer, 0,
+		k_timer_start(&data->timer, K_NO_WAIT,
 			      CONFIG_HT16K33_KEYSCAN_POLL_MSEC);
 	}
 
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
@@ -168,7 +168,7 @@ static int hp206c_wait_dev_ready(struct device *dev, u32_t timeout_ms)
 	struct hp206c_device_data *hp206c = dev->driver_data;
 	u8_t int_src;
 
-	k_timer_start(&hp206c->tmr, timeout_ms, 0);
+	k_timer_start(&hp206c->tmr, timeout_ms, K_NO_WAIT);
 	k_timer_status_sync(&hp206c->tmr);
 
 	if (hp206c_read_reg(dev, HP206C_REG_INT_SRC, &int_src) < 0) {
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
@@ -485,7 +485,8 @@ static int uarte_nrfx_tx(struct device *dev, const u8_t *buf, size_t len,
 	nrf_uarte_tx_buffer_set(uarte, buf, len);
 	nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);
 	if (data->uart_config.flow_ctrl == UART_CFG_FLOW_CTRL_RTS_CTS) {
-		k_timer_start(&data->async->tx_timeout_timer, timeout, 0);
+		k_timer_start(&data->async->tx_timeout_timer, timeout,
+			      K_NO_WAIT);
 	}
 	return 0;
 }
diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c
@@ -361,7 +361,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 	(void)memset(&bdt[idx_even], 0, sizeof(struct buf_descriptor));
 	(void)memset(&bdt[idx_odd], 0, sizeof(struct buf_descriptor));
 
-	if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps * 2U, 10) == 0) {
+	if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps * 2U, K_MSEC(10)) == 0) {
 		(void)memset(block->data, 0, cfg->ep_mps * 2U);
 	} else {
 		LOG_ERR("Memory allocation time-out");
diff --git a/drivers/usb/device/usb_dc_mcux_ehci.c b/drivers/usb/device/usb_dc_mcux_ehci.c
@@ -160,7 +160,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 		block->data = NULL;
 	}
 
-	if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps, 10) == 0) {
+	if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps, K_MSEC(10)) == 0) {
 		memset(block->data, 0, cfg->ep_mps);
 	} else {
 		LOG_ERR("Memory allocation time-out");
diff --git a/drivers/wifi/eswifi/eswifi_offload.c b/drivers/wifi/eswifi/eswifi_offload.c
@@ -433,7 +433,7 @@ static int eswifi_off_get(sa_family_t family,
 	k_sem_init(&socket->accept_sem, 1, 1);
 
 	k_delayed_work_submit_to_queue(&eswifi->work_q, &socket->read_work,
-				       500);
+				       K_MSEC(500));
 
 unlock:
 	eswifi_unlock(eswifi);
diff --git a/drivers/wifi/eswifi/eswifi_socket.c b/drivers/wifi/eswifi/eswifi_socket.c
@@ -141,7 +141,7 @@ static void eswifi_off_read_work(struct k_work *work)
 done:
 	err = k_delayed_work_submit_to_queue(&eswifi->work_q,
 					     &socket->read_work,
-					     500);
+					     K_MSEC(500));
 	if (err) {
 		LOG_ERR("Rescheduling socket read error");
 	}
diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c
@@ -344,7 +344,7 @@ static int eswifi_socket_open(int family, int type, int proto)
 	socket->recv_data = socket;
 
 	k_delayed_work_submit_to_queue(&eswifi->work_q, &socket->read_work,
-					500);
+					K_MSEC(500));
 
 unlock:
 	eswifi_unlock(eswifi);
diff --git a/lib/cmsis_rtos_v1/cmsis_mutex.c b/lib/cmsis_rtos_v1/cmsis_mutex.c
@@ -25,7 +25,7 @@ osMutexId osMutexCreate(const osMutexDef_t *mutex_def)
 		return NULL;
 	}
 
-	if (k_mem_slab_alloc(&cmsis_mutex_slab, (void **)&mutex, 100) == 0) {
+	if (k_mem_slab_alloc(&cmsis_mutex_slab, (void **)&mutex, K_MSEC(100)) == 0) {
 		(void)memset(mutex, 0, sizeof(struct k_mutex));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v1/cmsis_semaphore.c b/lib/cmsis_rtos_v1/cmsis_semaphore.c
@@ -27,7 +27,7 @@ osSemaphoreId osSemaphoreCreate(const osSemaphoreDef_t *semaphore_def,
 	}
 
 	if (k_mem_slab_alloc(&cmsis_semaphore_slab,
-				(void **)&semaphore, 100) == 0) {
+				(void **)&semaphore, K_MSEC(100)) == 0) {
 		(void)memset(semaphore, 0, sizeof(struct k_sem));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v1/cmsis_timer.c b/lib/cmsis_rtos_v1/cmsis_timer.c
@@ -47,7 +47,7 @@ osTimerId osTimerCreate(const osTimerDef_t *timer_def, os_timer_type type,
 		return NULL;
 	}
 
-	if (k_mem_slab_alloc(&cmsis_timer_slab, (void **)&timer, 100) == 0) {
+	if (k_mem_slab_alloc(&cmsis_timer_slab, (void **)&timer, K_MSEC(100)) == 0) {
 		(void)memset(timer, 0, sizeof(struct timer_obj));
 	} else {
 		return NULL;
@@ -79,9 +79,9 @@ osStatus osTimerStart(osTimerId timer_id, uint32_t millisec)
 	}
 
 	if (timer->type == osTimerOnce) {
-		k_timer_start(&timer->ztimer, millisec, 0);
+		k_timer_start(&timer->ztimer, millisec, K_NO_WAIT);
 	} else if (timer->type == osTimerPeriodic) {
-		k_timer_start(&timer->ztimer, 0, millisec);
+		k_timer_start(&timer->ztimer, K_NO_WAIT, millisec);
 	}
 
 	timer->status = ACTIVE;
diff --git a/lib/cmsis_rtos_v2/event_flags.c b/lib/cmsis_rtos_v2/event_flags.c
@@ -35,7 +35,7 @@ osEventFlagsId_t osEventFlagsNew(const osEventFlagsAttr_t *attr)
 		attr = &init_event_flags_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_event_flags_slab, (void **)&events, 100)
+	if (k_mem_slab_alloc(&cv2_event_flags_slab, (void **)&events, K_MSEC(100))
 	    == 0) {
 		memset(events, 0, sizeof(struct cv2_event_flags));
 	} else {
diff --git a/lib/cmsis_rtos_v2/mempool.c b/lib/cmsis_rtos_v2/mempool.c
@@ -45,7 +45,7 @@ osMemoryPoolId_t osMemoryPoolNew(uint32_t block_count, uint32_t block_size,
 		attr = &init_mslab_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_mem_slab, (void **)&mslab, 100) == 0) {
+	if (k_mem_slab_alloc(&cv2_mem_slab, (void **)&mslab, K_MSEC(100)) == 0) {
 		(void)memset(mslab, 0, sizeof(struct cv2_mslab));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v2/msgq.c b/lib/cmsis_rtos_v2/msgq.c
@@ -43,7 +43,7 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
 		attr = &init_msgq_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_msgq_slab, (void **)&msgq, 100) == 0) {
+	if (k_mem_slab_alloc(&cv2_msgq_slab, (void **)&msgq, K_MSEC(100)) == 0) {
 		(void)memset(msgq, 0, sizeof(struct cv2_msgq));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v2/mutex.c b/lib/cmsis_rtos_v2/mutex.c
@@ -38,7 +38,7 @@ osMutexId_t osMutexNew(const osMutexAttr_t *attr)
 	__ASSERT(!(attr->attr_bits & osMutexRobust),
 		 "Zephyr does not support osMutexRobust.\n");
 
-	if (k_mem_slab_alloc(&cv2_mutex_slab, (void **)&mutex, 100) == 0) {
+	if (k_mem_slab_alloc(&cv2_mutex_slab, (void **)&mutex, K_MSEC(100)) == 0) {
 		memset(mutex, 0, sizeof(struct cv2_mutex));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v2/semaphore.c b/lib/cmsis_rtos_v2/semaphore.c
@@ -34,7 +34,7 @@ osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count,
 	}
 
 	if (k_mem_slab_alloc(&cv2_semaphore_slab,
-			     (void **)&semaphore, 100) == 0) {
+			     (void **)&semaphore, K_MSEC(100)) == 0) {
 		(void)memset(semaphore, 0, sizeof(struct cv2_sem));
 	} else {
 		return NULL;
diff --git a/lib/cmsis_rtos_v2/timer.c b/lib/cmsis_rtos_v2/timer.c
@@ -50,7 +50,7 @@ osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type,
 		attr = &init_timer_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_timer_slab, (void **)&timer, 100) == 0) {
+	if (k_mem_slab_alloc(&cv2_timer_slab, (void **)&timer, K_MSEC(100)) == 0) {
 		(void)memset(timer, 0, sizeof(struct cv2_timer));
 	} else {
 		return NULL;
@@ -90,9 +90,9 @@ osStatus_t osTimerStart(osTimerId_t timer_id, uint32_t ticks)
 	}
 
 	if (timer->type == osTimerOnce) {
-		k_timer_start(&timer->z_timer, millisec, 0);
+		k_timer_start(&timer->z_timer, millisec, K_NO_WAIT);
 	} else if (timer->type == osTimerPeriodic) {
-		k_timer_start(&timer->z_timer, 0, millisec);
+		k_timer_start(&timer->z_timer, K_NO_WAIT, millisec);
 	}
 
 	timer->status = ACTIVE;
diff --git a/lib/posix/timer.c b/lib/posix/timer.c
@@ -58,7 +58,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
 		return -1;
 	}
 
-	if (k_mem_slab_alloc(&posix_timer_slab, (void **)&timer, 100) == 0) {
+	if (k_mem_slab_alloc(&posix_timer_slab, (void **)&timer, K_MSEC(100)) == 0) {
 		(void)memset(timer, 0, sizeof(struct timer_obj));
 	} else {
 		errno = ENOMEM;
diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf52/mesh/onoff-app/src/main.c
@@ -445,7 +445,7 @@ static void button_pressed(struct device *dev, struct gpio_callback *cb,
 	}
 
 	if (button_press_cnt == 0U) {
-		k_timer_start(&sw.button_timer, K_SECONDS(1), 0);
+		k_timer_start(&sw.button_timer, K_SECONDS(1), K_NO_WAIT);
 	}
 
 	printk("button_press_cnt 0x%02x\n", button_press_cnt);
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c
@@ -210,12 +210,12 @@ void main(void)
 	update_light_state();
 
 	short_time_multireset_bt_mesh_unprovisioning();
-	k_timer_start(&reset_counter_timer, K_MSEC(7000), 0);
+	k_timer_start(&reset_counter_timer, K_MSEC(7000), K_NO_WAIT);
 
 #if defined(CONFIG_MCUMGR)
 	/* Initialize the Bluetooth mcumgr transport. */
 	smp_bt_register();
 
-	k_timer_start(&smp_svr_timer, 0, K_MSEC(1000));
+	k_timer_start(&smp_svr_timer, K_NO_WAIT, K_MSEC(1000));
 #endif
 }
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c
@@ -69,14 +69,15 @@ static void no_transition_work_handler(struct k_work *work)
 		update_led_gpio();
 	}
 
-	k_timer_start(&unsolicitedly_publish_states_timer, K_MSEC(5000), 0);
+	k_timer_start(&unsolicitedly_publish_states_timer, K_MSEC(5000),
+		      K_NO_WAIT);
 
 	/* If Lightness & Temperature values remains stable for
 	 * 10 Seconds then & then only get stored on SoC flash.
 	 */
 	if (gen_power_onoff_srv_user_data.onpowerup == STATE_RESTORE) {
 		k_timer_start(&save_lightness_temp_last_values_timer,
-			      K_MSEC(10000), 0);
+			      K_MSEC(10000), K_NO_WAIT);
 	}
 }
 
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
@@ -214,7 +214,7 @@ static inline void msg_finalize(struct log_msg *msg,
 		irq_unlock(key);
 	} else if (proc_tid != NULL && buffered_cnt == 1) {
 		k_timer_start(&log_process_thread_timer,
-			CONFIG_LOG_PROCESS_THREAD_SLEEP_MS, 0);
+			CONFIG_LOG_PROCESS_THREAD_SLEEP_MS, K_NO_WAIT);
 	} else if (CONFIG_LOG_PROCESS_TRIGGER_THRESHOLD) {
 		if ((buffered_cnt == CONFIG_LOG_PROCESS_TRIGGER_THRESHOLD) &&
 		    (proc_tid != NULL)) {
diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c
@@ -735,7 +735,7 @@ void gptp_update_pdelay_req_interval(int port, s8_t log_val)
 		new_itv = 1;
 	}
 
-	k_timer_start(&state_pdelay->pdelay_timer, new_itv, 0);
+	k_timer_start(&state_pdelay->pdelay_timer, new_itv, K_NO_WAIT);
 }
 
 void gptp_update_sync_interval(int port, s8_t log_val)
@@ -814,7 +814,7 @@ void gptp_update_announce_interval(int port, s8_t log_val)
 		new_itv = 1;
 	}
 
-	k_timer_start(&state_ann->ann_send_periodic_timer, new_itv, 0);
+	k_timer_start(&state_ann->ann_send_periodic_timer, new_itv, K_NO_WAIT);
 }
 
 struct port_user_data {
diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.c b/subsys/net/l2/ethernet/gptp/gptp_md.c
@@ -203,7 +203,7 @@ static void gptp_md_pdelay_check_multiple_resp(int port)
 		duration = GPTP_MULTIPLE_PDELAY_RESP_WAIT -
 			gptp_uscaled_ns_to_timer_ms(&port_ds->pdelay_req_itv);
 
-		k_timer_start(&state->pdelay_timer, duration, 0);
+		k_timer_start(&state->pdelay_timer, duration, K_NO_WAIT);
 	} else {
 		state->state = GPTP_PDELAY_REQ_SEND_REQ;
 	}
@@ -636,7 +636,7 @@ static void gptp_md_pdelay_req_state_machine(int port)
 		k_timer_start(&state->pdelay_timer,
 			      gptp_uscaled_ns_to_timer_ms(
 				      &port_ds->pdelay_req_itv),
-			      0);
+			      K_NO_WAIT);
 		/*
 		 * Transition directly to GPTP_PDELAY_REQ_WAIT_RESP.
 		 * Check for the TX timestamp will be done during
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c
@@ -608,7 +608,7 @@ void gptp_handle_sync(int port, struct net_pkt *pkt)
 	duration = (upstream_sync_itv / 1000000U);
 
 	/* Start timeout timer. */
-	k_timer_start(&state->follow_up_discard_timer, duration, 0);
+	k_timer_start(&state->follow_up_discard_timer, duration, K_NO_WAIT);
 }
 
 int gptp_handle_follow_up(int port, struct net_pkt *pkt)
diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c
@@ -356,7 +356,8 @@ static void start_rcv_sync_timer(struct gptp_port_ds *port_ds,
 
 	duration = port_ds->sync_receipt_timeout_time_itv;
 
-	k_timer_start(&state->rcv_sync_receipt_timeout_timer, duration, 0);
+	k_timer_start(&state->rcv_sync_receipt_timeout_timer, duration,
+		      K_NO_WAIT);
 }
 
 static void gptp_mi_pss_rcv_state_machine(int port)
@@ -506,7 +507,8 @@ static void gptp_mi_pss_send_state_machine(int port)
 						&port_ds->half_sync_itv);
 
 		/* Start 0.5 * syncInterval timeout timer. */
-		k_timer_start(&state->half_sync_itv_timer, duration, 0);
+		k_timer_start(&state->half_sync_itv_timer, duration,
+			      K_NO_WAIT);
 
 		gptp_mi_pss_send_md_sync_send(port);
 
@@ -548,7 +550,7 @@ static void gptp_mi_pss_send_state_machine(int port)
 				(NSEC_PER_USEC * USEC_PER_MSEC);
 
 			k_timer_start(&state->send_sync_receipt_timeout_timer,
-				      duration, 0);
+				      duration, K_NO_WAIT);
 
 		} else if (state->send_sync_receipt_timeout_timer_expired) {
 			state->state = GPTP_PSS_SEND_SYNC_RECEIPT_TIMEOUT;
@@ -1474,7 +1476,7 @@ static void gptp_mi_port_announce_information_state_machine(int port)
 		k_timer_start(&state->ann_rcpt_expiry_timer,
 			      gptp_uscaled_ns_to_timer_ms(
 				   &bmca_data->ann_rcpt_timeout_time_interval),
-			      0);
+			      K_NO_WAIT);
 		/* Fallthrough. */
 
 	case GPTP_PA_INFO_INFERIOR_MASTER_OR_OTHER_PORT:
@@ -1872,7 +1874,7 @@ static void gptp_mi_port_announce_transmit_state_machine(int port)
 		k_timer_start(&state->ann_send_periodic_timer,
 			      gptp_uscaled_ns_to_timer_ms(
 				      &bmca_data->announce_interval),
-			      0);
+			      K_NO_WAIT);
 
 		state->state = GPTP_PA_TRANSMIT_POST_IDLE;
 		/* Fallthrough. */
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_utils.h b/subsys/net/l2/ieee802154/ieee802154_radio_utils.h
@@ -51,7 +51,7 @@ static inline int wait_for_ack(struct net_if *iface,
 		return 0;
 	}
 
-	if (k_sem_take(&ctx->ack_lock, 10) == 0) {
+	if (k_sem_take(&ctx->ack_lock, K_MSEC(10)) == 0) {
 		/*
 		 * We reinit the semaphore in case handle_ack
 		 * got called multiple times.
diff --git a/subsys/net/lib/openthread/platform/alarm.c b/subsys/net/lib/openthread/platform/alarm.c
@@ -51,7 +51,7 @@ void otPlatAlarmMilliStartAt(otInstance *aInstance, uint32_t t0, uint32_t dt)
 	s64_t delta = -k_uptime_delta(&reftime);
 
 	if (delta > 0) {
-		k_timer_start(&ot_timer, K_MSEC(delta), 0);
+		k_timer_start(&ot_timer, K_MSEC(delta), K_NO_WAIT);
 	} else {
 		ot_timer_fired(NULL);
 	}
diff --git a/subsys/shell/shell_telnet.c b/subsys/shell/shell_telnet.c
@@ -420,7 +420,7 @@ static int write(const struct shell_transport *transport,
 		 */
 		timeout = (timeout == 0) ? TELNET_TIMEOUT : timeout;
 
-		k_timer_start(&sh_telnet->send_timer, timeout, 0);
+		k_timer_start(&sh_telnet->send_timer, timeout, K_NO_WAIT);
 	}
 
 	sh_telnet->shell_handler(SHELL_TRANSPORT_EVT_TX_RDY,
diff --git a/tests/benchmarks/timing_info/src/msg_passing_bench.c b/tests/benchmarks/timing_info/src/msg_passing_bench.c
diff --git a/tests/benchmarks/timing_info/src/semaphore_bench.c b/tests/benchmarks/timing_info/src/semaphore_bench.c
diff --git a/tests/benchmarks/timing_info/src/yield_bench.c b/tests/benchmarks/timing_info/src/yield_bench.c
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
diff --git a/tests/kernel/common/src/timeout_order.c b/tests/kernel/common/src/timeout_order.c
diff --git a/tests/kernel/fatal/src/main.c b/tests/kernel/fatal/src/main.c
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
diff --git a/tests/kernel/mem_pool/mem_pool/src/main.c b/tests/kernel/mem_pool/mem_pool/src/main.c
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
diff --git a/tests/kernel/obj_tracing/src/main.c b/tests/kernel/obj_tracing/src/main.c
diff --git a/tests/kernel/pending/src/main.c b/tests/kernel/pending/src/main.c
diff --git a/tests/kernel/poll/src/test_poll.c b/tests/kernel/poll/src/test_poll.c
diff --git a/tests/kernel/sched/schedule_api/src/test_sched_timeslice_and_lock.c b/tests/kernel/sched/schedule_api/src/test_sched_timeslice_and_lock.c
diff --git a/tests/kernel/semaphore/semaphore/src/main.c b/tests/kernel/semaphore/semaphore/src/main.c
diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
diff --git a/tests/kernel/workq/work_queue_api/src/main.c b/tests/kernel/workq/work_queue_api/src/main.c

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ static inline void adc_context_enable_timer(struct adc_context *ctx)`
`95`	`95`	`u32_t interval_us = ctx->options.interval_us;`
`96`	`96`	`u32_t interval_ms = ceiling_fraction(interval_us, 1000UL);`
`97`	`97`
`98`		`- k_timer_start(&ctx->timer, 0, interval_ms);`
	`98`	`+ k_timer_start(&ctx->timer, K_NO_WAIT, interval_ms);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`static inline void adc_context_disable_timer(struct adc_context *ctx)`
Original file line number	Diff line number	Diff line change
`@@ -635,10 +635,10 @@ static int cc1200_tx(struct device *dev,`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`/* Wait for SYNC to be sent */`
`638`		`- k_sem_take(&cc1200->tx_sync, 100);`
	`638`	`+ k_sem_take(&cc1200->tx_sync, K_MSEC(100));`
`639`	`639`	`if (atomic_get(&cc1200->tx_start) == 1) {`
`640`	`640`	`/* Now wait for the packet to be fully sent */`
`641`		`- k_sem_take(&cc1200->tx_sync, 100);`
	`641`	`+ k_sem_take(&cc1200->tx_sync, K_MSEC(100));`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`out:`
Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ static int cc2520_tx(struct device *dev,`
`839`	`839`	`goto error;`
`840`	`840`	`}`
`841`	`841`
`842`		`- k_sem_take(&cc2520->tx_sync, 10);`
	`842`	`+ k_sem_take(&cc2520->tx_sync, K_MSEC(10));`
`843`	`843`
`844`	`844`	`retry--;`
`845`	`845`	`status = verify_tx_done(cc2520);`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ static int ht16k33_init(struct device *dev)`
`442`	`442`
`443`	`443`	`/* Setup timer for polling key data */`
`444`	`444`	`k_timer_init(&data->timer, ht16k33_timer_callback, NULL);`
`445`		`- k_timer_start(&data->timer, 0,`
	`445`	`+ k_timer_start(&data->timer, K_NO_WAIT,`
`446`	`446`	`CONFIG_HT16K33_KEYSCAN_POLL_MSEC);`
`447`	`447`	`}`
`448`	`448`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,8 @@ static int uarte_nrfx_tx(struct device dev, const u8_t buf, size_t len,`
`485`	`485`	`nrf_uarte_tx_buffer_set(uarte, buf, len);`
`486`	`486`	`nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTTX);`
`487`	`487`	`if (data->uart_config.flow_ctrl == UART_CFG_FLOW_CTRL_RTS_CTS) {`
`488`		`- k_timer_start(&data->async->tx_timeout_timer, timeout, 0);`
	`488`	`+ k_timer_start(&data->async->tx_timeout_timer, timeout,`
	`489`	`+ K_NO_WAIT);`
`489`	`490`	`}`
`490`	`491`	`return 0;`
`491`	`492`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)`
`160`	`160`	`block->data = NULL;`
`161`	`161`	`}`
`162`	`162`
`163`		`- if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps, 10) == 0) {`
	`163`	`+ if (k_mem_pool_alloc(&ep_buf_pool, block, cfg->ep_mps, K_MSEC(10)) == 0) {`
`164`	`164`	`memset(block->data, 0, cfg->ep_mps);`
`165`	`165`	`} else {`
`166`	`166`	`LOG_ERR("Memory allocation time-out");`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ static void eswifi_off_read_work(struct k_work *work)`
`141`	`141`	`done:`
`142`	`142`	`err = k_delayed_work_submit_to_queue(&eswifi->work_q,`
`143`	`143`	`&socket->read_work,`
`144`		`- 500);`
	`144`	`+ K_MSEC(500));`
`145`	`145`	`if (err) {`
`146`	`146`	`LOG_ERR("Rescheduling socket read error");`
`147`	`147`	`}`