Re: [PATCH 5/7] gpu: host1x: Rename relocarray -> relocs for consistency

From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Mikko Perttunen <mperttunen@nvidia.com>
Subject: Re: [PATCH 5/7] gpu: host1x: Rename relocarray -> relocs for consistency
Date: Fri, 18 May 2018 16:40:03 +0300	[thread overview]
Message-ID: <b03be014-830c-a953-6919-7d5aad1bb88a@gmail.com> (raw)
In-Reply-To: <20180517153430.9602-6-thierry.reding@gmail.com>

On 17.05.2018 18:34, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> All other array variables use a plural, and this is the only one using
> the *array suffix. This is confusing, so rename it for consistency.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/gpu/drm/tegra/drm.c | 4 ++--
>  drivers/gpu/host1x/job.c    | 8 ++++----
>  include/linux/host1x.h      | 2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index e92e44e69871..f9d6c059792f 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -418,13 +418,13 @@ int tegra_drm_submit(struct tegra_drm_context *context,
>  		struct host1x_reloc *reloc;
>  		struct tegra_bo *obj;
>  
> -		err = host1x_reloc_copy_from_user(&job->relocarray[num_relocs],
> +		err = host1x_reloc_copy_from_user(&job->relocs[num_relocs],
>  						  &user_relocs[num_relocs], drm,
>  						  file);
>  		if (err < 0)
>  			goto fail;
>  
> -		reloc = &job->relocarray[num_relocs];
> +		reloc = &job->relocs[num_relocs];
>  		obj = host1x_to_tegra_bo(reloc->cmdbuf.bo);
>  		refs[num_refs++] = &obj->gem;
>  
> diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
> index 2be0bcaf8288..9d6d3e151291 100644
> --- a/drivers/gpu/host1x/job.c
> +++ b/drivers/gpu/host1x/job.c
> @@ -60,7 +60,7 @@ struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
>  
>  	/* Redistribute memory to the structs  */
>  	mem += sizeof(struct host1x_job);
> -	job->relocarray = num_relocs ? mem : NULL;
> +	job->relocs = num_relocs ? mem : NULL;
>  	mem += num_relocs * sizeof(struct host1x_reloc);
>  	job->unpins = num_unpins ? mem : NULL;
>  	mem += num_unpins * sizeof(struct host1x_job_unpin_data);
> @@ -115,7 +115,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job)
>  	job->num_unpins = 0;
>  
>  	for (i = 0; i < job->num_relocs; i++) {
> -		struct host1x_reloc *reloc = &job->relocarray[i];
> +		struct host1x_reloc *reloc = &job->relocs[i];
>  		struct sg_table *sgt;
>  		dma_addr_t phys_addr;
>  
> @@ -203,7 +203,7 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g)
>  
>  	/* pin & patch the relocs for one gather */
>  	for (i = 0; i < job->num_relocs; i++) {
> -		struct host1x_reloc *reloc = &job->relocarray[i];
> +		struct host1x_reloc *reloc = &job->relocs[i];
>  		u32 reloc_addr = (job->reloc_addr_phys[i] +
>  				  reloc->target.offset) >> reloc->shift;
>  		u32 *target;
> @@ -455,7 +455,7 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)
>  
>  	fw.job = job;
>  	fw.dev = dev;
> -	fw.reloc = job->relocarray;
> +	fw.reloc = job->relocs;
>  	fw.num_relocs = job->num_relocs;
>  	fw.class = job->class;
>  
> diff --git a/include/linux/host1x.h b/include/linux/host1x.h
> index 0632010f47fb..dcb6140d39d7 100644
> --- a/include/linux/host1x.h
> +++ b/include/linux/host1x.h
> @@ -210,7 +210,7 @@ struct host1x_job {
>  	unsigned int num_gathers;
>  
>  	/* Array of handles to be pinned & unpinned */
> -	struct host1x_reloc *relocarray;
> +	struct host1x_reloc *relocs;
>  	unsigned int num_relocs;
>  	struct host1x_job_unpin_data *unpins;
>  	unsigned int num_unpins;
> 

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel