Re: [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl

[Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>]

On 05/01/2022 10:05, Jani Nikula wrote:
> Follow the usual naming convention.

But intel_uncore_ prefix usually means functions takes intel_uncore as 
the first argument.

Maybe solution here is that i915_reg_read_ioctl does not belong in 
intel_uncore.c, it being the UAPI layer thing? I guess arguments could 
be made for either way.

Regards,

Tvrtko

> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
>   drivers/gpu/drm/i915/i915_driver.c  | 2 +-
>   drivers/gpu/drm/i915/intel_uncore.c | 4 ++--
>   drivers/gpu/drm/i915/intel_uncore.h | 4 ++--
>   3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 95174938b160..f9a494e159dc 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
>   	DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_RENDER_ALLOW),
>   	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE_EXT, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW),
>   	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW),
> -	DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW),
> +	DRM_IOCTL_DEF_DRV(I915_REG_READ, intel_uncore_reg_read_ioctl, DRM_RENDER_ALLOW),
>   	DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW),
>   	DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_RENDER_ALLOW),
>   	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index fc25ebf1a593..33f95bb2d3d5 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -2269,8 +2269,8 @@ static const struct reg_whitelist {
>   	.size = 8
>   } };
>   
> -int i915_reg_read_ioctl(struct drm_device *dev,
> -			void *data, struct drm_file *file)
> +int intel_uncore_reg_read_ioctl(struct drm_device *dev,
> +				void *data, struct drm_file *file)
>   {
>   	struct drm_i915_private *i915 = to_i915(dev);
>   	struct intel_uncore *uncore = &i915->uncore;
> diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
> index 3a87bbd906f8..697ac4586159 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.h
> +++ b/drivers/gpu/drm/i915/intel_uncore.h
> @@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,
>   #define raw_reg_write(base, reg, value) \
>   	writel(value, base + i915_mmio_reg_offset(reg))
>   
> -int i915_reg_read_ioctl(struct drm_device *dev, void *data,
> -			struct drm_file *file);
> +int intel_uncore_reg_read_ioctl(struct drm_device *dev, void *data,
> +				struct drm_file *file);
>   
>   #endif /* !__INTEL_UNCORE_H__ */