[PATCH 76/85] drivers: gpu: Move prototype declaration to header file radeon_drv.h from radeon_drv.c

Alex Deucher alexdeucher at gmail.com
Tue Jan 7 08:19:34 PST 2014


On Mon, Jan 6, 2014 at 11:41 AM, Rashika Kheria
<rashika.kheria at gmail.com> wrote:
> Move prototype declaration of function radeon_kms_compat_ioctl() to
> header file drm/radeon/radeon_drv.h because it is used by more than one
> file.
>
> This eliminates the following warning in
> drivers/gpu/drm/radeon/radeon_ioc32.c:413:6: warning: no previous prototype for ‘radeon_kms_compat_ioctl’ [-Wmissing-prototypes]
>
> Signed-off-by: Rashika Kheria <rashika.kheria at gmail.com>
> Reviewed-by: Josh Triplett <josh at joshtriplett.org>
> ---
>  drivers/gpu/drm/radeon/radeon_drv.c |    2 --
>  drivers/gpu/drm/radeon/radeon_drv.h |    3 ++-
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 9f5ff28..7868d4e 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -127,8 +127,6 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj);
>  void radeon_gem_prime_unpin(struct drm_gem_object *obj);
>  void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
>  void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
> -extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd,
> -                                   unsigned long arg);
>
>  #if defined(CONFIG_DEBUG_FS)
>  int radeon_debugfs_init(struct drm_minor *minor);
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
> index 00e0d44..7e1f2215 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.h
> +++ b/drivers/gpu/drm/radeon/radeon_drv.h
> @@ -425,7 +425,8 @@ extern int radeon_driver_open(struct drm_device *dev,
>                               struct drm_file *file_priv);
>  extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
>                                 unsigned long arg);
> -
> +extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd,
> +                                   unsigned long arg);

This needs to be moved to the top of the file, outside of the
CONFIG_DRM_RADEON_UMS ifdef.

Alex

>  extern int radeon_master_create(struct drm_device *dev, struct drm_master *master);
>  extern void radeon_master_destroy(struct drm_device *dev, struct drm_master *master);
>  extern void radeon_cp_dispatch_flip(struct drm_device *dev, struct drm_master *master);
> --
> 1.7.9.5
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the dri-devel mailing list