Re: [PATCH] drm/amdkfd: Remove an unused parameter in queue creation

[Felix Kuehling <felix.kuehling@amd.com>]

On 2024-09-23 05:11, Lang Yu wrote:
> struct file *f is unused in queue creation, remove it.
>
> Signed-off-by: Lang Yu <lang.yu@amd.com>

Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_chardev.c               |  2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_priv.h                  |  1 -
>   drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 ++++------
>   3 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 9044bdb38cf4..a1f191a5984b 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -365,7 +365,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
>   			p->pasid,
>   			dev->id);
>   
> -	err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id,
> +	err = pqm_create_queue(&p->pqm, dev, &q_properties, &queue_id,
>   			NULL, NULL, NULL, &doorbell_offset_in_process);
>   	if (err != 0)
>   		goto err_create_queue;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index d6530febabad..6a5bf88cc232 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -1347,7 +1347,6 @@ int pqm_init(struct process_queue_manager *pqm, struct kfd_process *p);
>   void pqm_uninit(struct process_queue_manager *pqm);
>   int pqm_create_queue(struct process_queue_manager *pqm,
>   			    struct kfd_node *dev,
> -			    struct file *f,
>   			    struct queue_properties *properties,
>   			    unsigned int *qid,
>   			    const struct kfd_criu_queue_priv_data *q_data,
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
> index 01b960b15274..c76db22a1000 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
> @@ -235,7 +235,7 @@ void pqm_uninit(struct process_queue_manager *pqm)
>   static int init_user_queue(struct process_queue_manager *pqm,
>   				struct kfd_node *dev, struct queue **q,
>   				struct queue_properties *q_properties,
> -				struct file *f, unsigned int qid)
> +				unsigned int qid)
>   {
>   	int retval;
>   
> @@ -300,7 +300,6 @@ static int init_user_queue(struct process_queue_manager *pqm,
>   
>   int pqm_create_queue(struct process_queue_manager *pqm,
>   			    struct kfd_node *dev,
> -			    struct file *f,
>   			    struct queue_properties *properties,
>   			    unsigned int *qid,
>   			    const struct kfd_criu_queue_priv_data *q_data,
> @@ -374,7 +373,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
>   		 * allocate_sdma_queue() in create_queue() has the
>   		 * corresponding check logic.
>   		 */
> -		retval = init_user_queue(pqm, dev, &q, properties, f, *qid);
> +		retval = init_user_queue(pqm, dev, &q, properties, *qid);
>   		if (retval != 0)
>   			goto err_create_queue;
>   		pqn->q = q;
> @@ -395,7 +394,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
>   			goto err_create_queue;
>   		}
>   
> -		retval = init_user_queue(pqm, dev, &q, properties, f, *qid);
> +		retval = init_user_queue(pqm, dev, &q, properties, *qid);
>   		if (retval != 0)
>   			goto err_create_queue;
>   		pqn->q = q;
> @@ -1029,8 +1028,7 @@ int kfd_criu_restore_queue(struct kfd_process *p,
>   
>   	print_queue_properties(&qp);
>   
> -	ret = pqm_create_queue(&p->pqm, pdd->dev, NULL, &qp, &queue_id, q_data, mqd, ctl_stack,
> -				NULL);
> +	ret = pqm_create_queue(&p->pqm, pdd->dev, &qp, &queue_id, q_data, mqd, ctl_stack, NULL);
>   	if (ret) {
>   		pr_err("Failed to create new queue err:%d\n", ret);
>   		goto exit;