* [PATCH] drm/radeon/radeon_device: clean function declarations in radeon_device.c up
@ 2016-09-14 6:10 Baoyou Xie
2016-09-14 7:22 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Baoyou Xie @ 2016-09-14 6:10 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied
Cc: dri-devel, linux-kernel, arnd, baoyou.xie, xie.baoyou
We get 2 warnings when building kernel with W=1:
drivers/gpu/drm/radeon/radeon_device.c:1961:5: warning: no previous prototype for 'radeon_debugfs_init' [-Wmissing-prototypes]
drivers/gpu/drm/radeon/radeon_device.c:1966:6: warning: no previous prototype for 'radeon_debugfs_cleanup' [-Wmissing-prototypes]
In fact, both functions are declared in
drivers/gpu/drm/radeon/radeon_drv.c, but should be declared in
a header file, thus can be recognized in other file.
So this patch moves the declarations into drivers/gpu/drm/radeon/radeon.h.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
drivers/gpu/drm/radeon/radeon_device.c | 1 +
drivers/gpu/drm/radeon/radeon_drv.c | 5 -----
drivers/gpu/drm/radeon/radeon_drv.h | 5 +++++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index a00dd2f..811abde 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -36,6 +36,7 @@
#include <linux/efi.h>
#include "radeon_reg.h"
#include "radeon.h"
+#include "radeon_drv.h"
#include "atom.h"
static const char radeon_family_name[][16] = {
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 07e4493..6cc4a9e 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -156,11 +156,6 @@ 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);
-void radeon_debugfs_cleanup(struct drm_minor *minor);
-#endif
-
/* atpx handler */
#if defined(CONFIG_VGA_SWITCHEROO)
void radeon_register_atpx_handler(void);
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index afef2d9..3d35e0e 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -119,4 +119,9 @@
long radeon_drm_ioctl(struct file *filp,
unsigned int cmd, unsigned long arg);
+#if defined(CONFIG_DEBUG_FS)
+int radeon_debugfs_init(struct drm_minor *minor);
+void radeon_debugfs_cleanup(struct drm_minor *minor);
+#endif
+
#endif /* __RADEON_DRV_H__ */
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/radeon/radeon_device: clean function declarations in radeon_device.c up
2016-09-14 6:10 [PATCH] drm/radeon/radeon_device: clean function declarations in radeon_device.c up Baoyou Xie
@ 2016-09-14 7:22 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2016-09-14 7:22 UTC (permalink / raw)
To: Baoyou Xie, alexander.deucher, airlied
Cc: dri-devel, linux-kernel, arnd, xie.baoyou
Am 14.09.2016 um 08:10 schrieb Baoyou Xie:
> We get 2 warnings when building kernel with W=1:
> drivers/gpu/drm/radeon/radeon_device.c:1961:5: warning: no previous prototype for 'radeon_debugfs_init' [-Wmissing-prototypes]
> drivers/gpu/drm/radeon/radeon_device.c:1966:6: warning: no previous prototype for 'radeon_debugfs_cleanup' [-Wmissing-prototypes]
>
> In fact, both functions are declared in
> drivers/gpu/drm/radeon/radeon_drv.c, but should be declared in
> a header file, thus can be recognized in other file.
>
> So this patch moves the declarations into drivers/gpu/drm/radeon/radeon.h.
>
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Actually if I see it correctly we could also just remove the two
callbacks cause they are optional and our implementations are just empty
dummys.
Christian.
> ---
> drivers/gpu/drm/radeon/radeon_device.c | 1 +
> drivers/gpu/drm/radeon/radeon_drv.c | 5 -----
> drivers/gpu/drm/radeon/radeon_drv.h | 5 +++++
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index a00dd2f..811abde 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -36,6 +36,7 @@
> #include <linux/efi.h>
> #include "radeon_reg.h"
> #include "radeon.h"
> +#include "radeon_drv.h"
> #include "atom.h"
>
> static const char radeon_family_name[][16] = {
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 07e4493..6cc4a9e 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -156,11 +156,6 @@ 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);
> -void radeon_debugfs_cleanup(struct drm_minor *minor);
> -#endif
> -
> /* atpx handler */
> #if defined(CONFIG_VGA_SWITCHEROO)
> void radeon_register_atpx_handler(void);
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
> index afef2d9..3d35e0e 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.h
> +++ b/drivers/gpu/drm/radeon/radeon_drv.h
> @@ -119,4 +119,9 @@
> long radeon_drm_ioctl(struct file *filp,
> unsigned int cmd, unsigned long arg);
>
> +#if defined(CONFIG_DEBUG_FS)
> +int radeon_debugfs_init(struct drm_minor *minor);
> +void radeon_debugfs_cleanup(struct drm_minor *minor);
> +#endif
> +
> #endif /* __RADEON_DRV_H__ */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-14 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 6:10 [PATCH] drm/radeon/radeon_device: clean function declarations in radeon_device.c up Baoyou Xie
2016-09-14 7:22 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).