diff --git a/drivers/video/rockchip/rga3/include/rga_job.h b/drivers/video/rockchip/rga3/include/rga_job.h index 214472e316a3..cbbfbd6b54c0 100644 --- a/drivers/video/rockchip/rga3/include/rga_job.h +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -21,8 +21,6 @@ enum job_flags { RGA_JOB_UNSUPPORT_RGA_MMU = 1 << 4, }; -struct rga_scheduler_t *rga_job_get_scheduler(struct rga_job *job); - void rga_job_session_destroy(struct rga_session *session); void rga_job_scheduler_dump_info(struct rga_scheduler_t *scheduler); @@ -52,10 +50,4 @@ int rga_request_release_signal(struct rga_scheduler_t *scheduler, struct rga_job int rga_request_manager_init(struct rga_pending_request_manager **request_manager_session); int rga_request_manager_remove(struct rga_pending_request_manager **request_manager_session); -struct rga_job * -rga_scheduler_get_pending_job_list(struct rga_scheduler_t *scheduler); - -struct rga_job * -rga_scheduler_get_running_job(struct rga_scheduler_t *scheduler); - #endif /* __LINUX_RKRGA_JOB_H_ */ diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c index 729b46138f9f..567df28396a8 100644 --- a/drivers/video/rockchip/rga3/rga_job.c +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -14,42 +14,6 @@ #include "rga_iommu.h" #include "rga_debugger.h" -struct rga_job * -rga_scheduler_get_pending_job_list(struct rga_scheduler_t *scheduler) -{ - unsigned long flags; - struct rga_job *job; - - spin_lock_irqsave(&scheduler->irq_lock, flags); - - job = list_first_entry_or_null(&scheduler->todo_list, - struct rga_job, head); - - spin_unlock_irqrestore(&scheduler->irq_lock, flags); - - return job; -} - -struct rga_job * -rga_scheduler_get_running_job(struct rga_scheduler_t *scheduler) -{ - unsigned long flags; - struct rga_job *job; - - spin_lock_irqsave(&scheduler->irq_lock, flags); - - job = scheduler->running_job; - - spin_unlock_irqrestore(&scheduler->irq_lock, flags); - - return job; -} - -struct rga_scheduler_t *rga_job_get_scheduler(struct rga_job *job) -{ - return job->scheduler; -} - static void rga_job_free(struct rga_job *job) { free_page((unsigned long)job); @@ -411,7 +375,7 @@ static struct rga_scheduler_t *rga_job_schedule(struct rga_job *job) job->scheduler = rga_drvdata->scheduler[0]; } - scheduler = rga_job_get_scheduler(job); + scheduler = job->scheduler; if (scheduler == NULL) { pr_err("failed to get scheduler, %s(%d)\n", __func__, __LINE__); job->ret = -EFAULT;