There are 'enum drm_ioctl_flags' and 'bool drm_ioctl_flags(...)' with the same name, which is not a problem in C, but it can lead to 'WARNING: Duplicate C declaration' when generating documentation. According to the purpose of the function, rename 'drm_ioctl_flags(...)' to 'drm_ioctl_flags_check(...)' to eliminate the warning. Signed-off-by: Juntong Deng <juntong.deng@xxxxxxxxxxx> --- drivers/gpu/drm/drm_ioctl.c | 6 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- include/drm/drm_ioctl.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index f03ffbacfe9b..feaa58ca36f7 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -911,7 +911,7 @@ long drm_ioctl(struct file *filp, EXPORT_SYMBOL(drm_ioctl); /** - * drm_ioctl_flags - Check for core ioctl and return ioctl permission flags + * drm_ioctl_flags_check - Check for core ioctl and return ioctl permission flags * @nr: ioctl number * @flags: where to return the ioctl permission flags * @@ -922,7 +922,7 @@ EXPORT_SYMBOL(drm_ioctl); * Returns: * True if the @nr corresponds to a DRM core ioctl number, false otherwise. */ -bool drm_ioctl_flags(unsigned int nr, unsigned int *flags) +bool drm_ioctl_flags_check(unsigned int nr, unsigned int *flags) { if (nr >= DRM_COMMAND_BASE && nr < DRM_COMMAND_END) return false; @@ -934,4 +934,4 @@ bool drm_ioctl_flags(unsigned int nr, unsigned int *flags) *flags = drm_ioctls[nr].flags; return true; } -EXPORT_SYMBOL(drm_ioctl_flags); +EXPORT_SYMBOL(drm_ioctl_flags_check); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 8b24ecf60e3e..2aafc7a62bee 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1287,7 +1287,7 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd, goto out_io_encoding; flags = ioctl->flags; - } else if (!drm_ioctl_flags(nr, &flags)) + } else if (!drm_ioctl_flags_check(nr, &flags)) return -EINVAL; return ioctl_func(filp, cmd, arg); diff --git a/include/drm/drm_ioctl.h b/include/drm/drm_ioctl.h index 6ed61c371f6c..465c5de2d5cd 100644 --- a/include/drm/drm_ioctl.h +++ b/include/drm/drm_ioctl.h @@ -175,7 +175,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); /* Let drm_compat_ioctl be assigned to .compat_ioctl unconditionally */ #define drm_compat_ioctl NULL #endif -bool drm_ioctl_flags(unsigned int nr, unsigned int *flags); +bool drm_ioctl_flags_check(unsigned int nr, unsigned int *flags); int drm_noop(struct drm_device *dev, void *data, struct drm_file *file_priv); -- 2.39.2