michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: rcar: assume can_send() always provides callback

Browse source 
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>
This commit is contained in:
Henrik Brix Andersen 2022-09-20 17:27:31 +02:00 • committed by Fabio Baltieri
commit d3427d991a
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/can/can_rcar.c
View file

@ -185,7 +185,6 @@ struct can_rcar_cfg {
}; };
struct can_rcar_tx_cb { struct can_rcar_tx_cb {
struct k_sem sem;
can_tx_callback_t cb; can_tx_callback_t cb;
void *cb_arg; void *cb_arg;
}; };
@ -231,11 +230,7 @@ static void can_rcar_tx_done(const struct device *dev)
} }
data->tx_unsent--; data->tx_unsent--;
if (tx_cb->cb != NULL) { tx_cb->cb(dev, 0, tx_cb->cb_arg);
tx_cb->cb(dev, 0, tx_cb->cb_arg);
} else {
k_sem_give(&tx_cb->sem);
}
k_sem_give(&data->tx_sem); k_sem_give(&data->tx_sem);
} }
@ -864,6 +859,7 @@ static int can_rcar_send(const struct device *dev, const struct can_frame *frame
"standard" : "extended" "standard" : "extended"
, frame->rtr == CAN_DATAFRAME ? "no" : "yes"); , frame->rtr == CAN_DATAFRAME ? "no" : "yes");
__ASSERT_NO_MSG(callback != NULL);
__ASSERT(frame->dlc == 0U || frame->data != NULL, "Dataptr is null"); __ASSERT(frame->dlc == 0U || frame->data != NULL, "Dataptr is null");
if (frame->dlc > CAN_MAX_DLC) { if (frame->dlc > CAN_MAX_DLC) {
@ -886,8 +882,6 @@ static int can_rcar_send(const struct device *dev, const struct can_frame *frame
tx_cb->cb = callback; tx_cb->cb = callback;
tx_cb->cb_arg = user_data; tx_cb->cb_arg = user_data;
k_sem_reset(&tx_cb->sem);
data->tx_head++; data->tx_head++;
if (data->tx_head >= RCAR_CAN_FIFO_DEPTH) { if (data->tx_head >= RCAR_CAN_FIFO_DEPTH) {
data->tx_head = 0; data->tx_head = 0;
@ -921,9 +915,6 @@ static int can_rcar_send(const struct device *dev, const struct can_frame *frame
sys_write8(0xff, config->reg_addr + RCAR_CAN_TFPCR); sys_write8(0xff, config->reg_addr + RCAR_CAN_TFPCR);
k_mutex_unlock(&data->inst_mutex); k_mutex_unlock(&data->inst_mutex);
if (callback == NULL) {
k_sem_take(&tx_cb->sem, K_FOREVER);
}
return 0; return 0;
} }
@ -986,14 +977,10 @@ static int can_rcar_init(const struct device *dev)
struct can_timing timing; struct can_timing timing;
int ret; int ret;
uint16_t ctlr; uint16_t ctlr;
uint8_t idx;
k_mutex_init(&data->inst_mutex); k_mutex_init(&data->inst_mutex);
k_mutex_init(&data->rx_mutex); k_mutex_init(&data->rx_mutex);
k_sem_init(&data->tx_sem, RCAR_CAN_FIFO_DEPTH, RCAR_CAN_FIFO_DEPTH); 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_head = 0;
data->tx_tail = 0; data->tx_tail = 0;