Skip to content

Commit b3c0d72

Browse files
Chun-Kuang HuJassiBrar
authored andcommitted
mailbox: mtk-cmdq: Remove cmdq_cb_status
cmdq_cb_status is an error status. Use the standard error number instead of cmdq_cb_status to prevent status duplication. Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> Reviewed-by: Yongqiang Niu <yongqiang.niu@mediatek.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent 4f0b776 commit b3c0d72

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static bool cmdq_thread_is_in_wfe(struct cmdq_thread *thread)
180180
return readl(thread->base + CMDQ_THR_WAIT_TOKEN) & CMDQ_THR_IS_WAITING;
181181
}
182182

183-
static void cmdq_task_exec_done(struct cmdq_task *task, enum cmdq_cb_status sta)
183+
static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
184184
{
185185
struct cmdq_task_cb *cb = &task->pkt->async_cb;
186186
struct cmdq_cb_data data;
@@ -244,10 +244,10 @@ static void cmdq_thread_irq_handler(struct cmdq *cmdq,
244244
curr_task = task;
245245

246246
if (!curr_task || curr_pa == task_end_pa - CMDQ_INST_SIZE) {
247-
cmdq_task_exec_done(task, CMDQ_CB_NORMAL);
247+
cmdq_task_exec_done(task, 0);
248248
kfree(task);
249249
} else if (err) {
250-
cmdq_task_exec_done(task, CMDQ_CB_ERROR);
250+
cmdq_task_exec_done(task, -ENOEXEC);
251251
cmdq_task_handle_error(curr_task);
252252
kfree(task);
253253
}
@@ -415,7 +415,7 @@ static void cmdq_mbox_shutdown(struct mbox_chan *chan)
415415

416416
list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
417417
list_entry) {
418-
cmdq_task_exec_done(task, CMDQ_CB_ERROR);
418+
cmdq_task_exec_done(task, -ECONNABORTED);
419419
kfree(task);
420420
}
421421

@@ -453,7 +453,7 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
453453
list_entry) {
454454
cb = &task->pkt->async_cb;
455455
if (cb->cb) {
456-
data.sta = CMDQ_CB_ERROR;
456+
data.sta = -ECONNABORTED;
457457
data.data = cb->data;
458458
cb->cb(data);
459459
}

include/linux/mailbox/mtk-cmdq-mailbox.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,8 @@ enum cmdq_code {
6565
CMDQ_CODE_LOGIC = 0xa0,
6666
};
6767

68-
enum cmdq_cb_status {
69-
CMDQ_CB_NORMAL = 0,
70-
CMDQ_CB_ERROR
71-
};
72-
7368
struct cmdq_cb_data {
74-
enum cmdq_cb_status sta;
69+
int sta;
7570
void *data;
7671
};
7772

0 commit comments

Comments
 (0)