drivers: can: rcar: assume can_send() always provides callback
Given the recent change to the CAN controller can_send() API wrapper,
assume that a callback is always provided at the driver level.
Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
diff --git a/drivers/can/can_rcar.c b/drivers/can/can_rcar.c
index 65b9ec6..22514b4 100644
--- a/drivers/can/can_rcar.c
+++ b/drivers/can/can_rcar.c
@@ -185,7 +185,6 @@
};
struct can_rcar_tx_cb {
- struct k_sem sem;
can_tx_callback_t cb;
void *cb_arg;
};
@@ -231,11 +230,7 @@
}
data->tx_unsent--;
- if (tx_cb->cb != NULL) {
- tx_cb->cb(dev, 0, tx_cb->cb_arg);
- } else {
- k_sem_give(&tx_cb->sem);
- }
+ tx_cb->cb(dev, 0, tx_cb->cb_arg);
k_sem_give(&data->tx_sem);
}
@@ -864,6 +859,7 @@
"standard" : "extended"
, frame->rtr == CAN_DATAFRAME ? "no" : "yes");
+ __ASSERT_NO_MSG(callback != NULL);
__ASSERT(frame->dlc == 0U || frame->data != NULL, "Dataptr is null");
if (frame->dlc > CAN_MAX_DLC) {
@@ -886,8 +882,6 @@
tx_cb->cb = callback;
tx_cb->cb_arg = user_data;
- k_sem_reset(&tx_cb->sem);
-
data->tx_head++;
if (data->tx_head >= RCAR_CAN_FIFO_DEPTH) {
data->tx_head = 0;
@@ -921,9 +915,6 @@
sys_write8(0xff, config->reg_addr + RCAR_CAN_TFPCR);
k_mutex_unlock(&data->inst_mutex);
- if (callback == NULL) {
- k_sem_take(&tx_cb->sem, K_FOREVER);
- }
return 0;
}
@@ -986,14 +977,10 @@
struct can_timing timing;
int ret;
uint16_t ctlr;
- uint8_t idx;
k_mutex_init(&data->inst_mutex);
k_mutex_init(&data->rx_mutex);
k_sem_init(&data->tx_sem, RCAR_CAN_FIFO_DEPTH, RCAR_CAN_FIFO_DEPTH);
- for (idx = 0; idx < RCAR_CAN_FIFO_DEPTH; idx++) {
- k_sem_init(&data->tx_cb[idx].sem, 0, 1);
- }
data->tx_head = 0;
data->tx_tail = 0;
