From e2d8ad5075d048c59c79305c80eee0573da20c8b Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Mon, 22 Mar 2021 14:30:10 +0800 Subject: [PATCH] video: rockchip: mpp: common: remove work_lock Remove work_lock in mpp_taskqueue. Change-Id: Ideda9e23acae5df9aa91136d9d4678d9ee4e2c7e Signed-off-by: Herman Chen --- drivers/video/rockchip/mpp/mpp_common.c | 7 +------ drivers/video/rockchip/mpp/mpp_common.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c index fcdbc00fa293..e9d51f42a398 100644 --- a/drivers/video/rockchip/mpp/mpp_common.c +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -184,15 +184,11 @@ mpp_taskqueue_pop_running(struct mpp_taskqueue *queue, return 0; } -static int +static void mpp_taskqueue_trigger_work(struct mpp_taskqueue *queue, struct workqueue_struct *workq) { - mutex_lock(&queue->work_lock); queue_work(workq, &queue->work); - mutex_unlock(&queue->work_lock); - - return 0; } int mpp_power_on(struct mpp_dev *mpp) @@ -783,7 +779,6 @@ err_put_pdev: int mpp_taskqueue_init(struct mpp_taskqueue *queue, struct mpp_service *srv) { - mutex_init(&queue->work_lock); mutex_init(&queue->pending_lock); mutex_init(&queue->running_lock); mutex_init(&queue->mmu_lock); diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h index 991e6050e259..121f2d9e7af3 100644 --- a/drivers/video/rockchip/mpp/mpp_common.h +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -377,8 +377,6 @@ struct mpp_task { }; struct mpp_taskqueue { - /* lock for trigger work */ - struct mutex work_lock; /* work for taskqueue */ struct work_struct work;