In commit dbe48d030b28 ("drm/sched: Split drm_sched_job_init") the only
use of the entity argument of drm_sched_fence_alloc(), fence->sched =
entity->rq->sched, moved into drm_sched_fence_init(), and the now unused
argument was left behind.Drop the argument. The sole caller still passes the entity to drm_sched_fence_init() at arm time, so behavior is unchanged. This also removes the parameter-name mismatch between the declaration (s_entity) and the definition (entity). Signed-off-by: Donggeun Yoo <[email protected]> Assisted-by: Claude:claude-fable-5 --- Targets drm-misc-next. No functional change; compile-tested with W=1. v2: trim the first paragraph, which read as if the patch addressed a bug when it only removes an unused argument (Philipp Stanner). Capitalize the subject to match the subtree. Link to v1: https://lore.kernel.org/dri-devel/[email protected]/ drivers/gpu/drm/scheduler/sched_fence.c | 3 +-- drivers/gpu/drm/scheduler/sched_internal.h | 3 +-- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index 096fe28aa9c9..b7a4cb921234 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -205,8 +205,7 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) } EXPORT_SYMBOL(to_drm_sched_fence); -struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *entity, - void *owner, +struct drm_sched_fence *drm_sched_fence_alloc(void *owner, u64 drm_client_id) { struct drm_sched_fence *fence = NULL; diff --git a/drivers/gpu/drm/scheduler/sched_internal.h b/drivers/gpu/drm/scheduler/sched_internal.h index a901801fce85..32d3ddb820be 100644 --- a/drivers/gpu/drm/scheduler/sched_internal.h +++ b/drivers/gpu/drm/scheduler/sched_internal.h @@ -58,8 +58,7 @@ drm_sched_rq_select_entity(struct drm_gpu_scheduler *sched, void drm_sched_entity_select_rq(struct drm_sched_entity *entity); struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity); -struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *s_entity, - void *owner, u64 drm_client_id); +struct drm_sched_fence *drm_sched_fence_alloc(void *owner, u64 drm_client_id); void drm_sched_fence_init(struct drm_sched_fence *fence, struct drm_sched_entity *entity); void drm_sched_fence_free(struct drm_sched_fence *fence); diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 6cb6f9546493..e4835b99ca60 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -612,7 +612,7 @@ int drm_sched_job_init(struct drm_sched_job *job, job->entity = entity; job->credits = credits; - job->s_fence = drm_sched_fence_alloc(entity, owner, drm_client_id); + job->s_fence = drm_sched_fence_alloc(owner, drm_client_id); if (!job->s_fence) return -ENOMEM; -- 2.53.0
