* [PATCH] drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup
@ 2017-03-20 9:39 Arnd Bergmann
2017-03-20 9:59 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-03-20 9:39 UTC (permalink / raw)
To: Rob Clark, David Airlie
Cc: Arnd Bergmann, Archit Taneja, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, linux-kernel
We now call those two functions even when they are not defined
or declared anywhere because DEBUG_FS is disabled:
drivers/gpu/drm/msm/msm_drv.c: In function 'msm_drm_uninit':
drivers/gpu/drm/msm/msm_drv.c:244:2: error: implicit declaration of function 'msm_perf_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration]
drivers/gpu/drm/msm/msm_drv.c:245:2: error: implicit declaration of function 'msm_rd_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration]
This adds empty stub implementations for that case.
Fixes: 85eac4700ede ("drm/msm: Remove msm_debugfs_cleanup()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/msm/msm_drv.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index b51fb0d70f43..b885c3d5ae4d 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -311,6 +311,8 @@ void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);
#else
static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }
static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
+static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}
+static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}
#endif
struct clk *msm_clk_get(struct platform_device *pdev, const char *name);
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup
2017-03-20 9:39 [PATCH] drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup Arnd Bergmann
@ 2017-03-20 9:59 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2017-03-20 9:59 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Rob Clark, David Airlie, Archit Taneja, Daniel Vetter,
linux-arm-msm, dri-devel, freedreno, linux-kernel
On Mon, Mar 20, 2017 at 10:39:25AM +0100, Arnd Bergmann wrote:
> We now call those two functions even when they are not defined
> or declared anywhere because DEBUG_FS is disabled:
>
> drivers/gpu/drm/msm/msm_drv.c: In function 'msm_drm_uninit':
> drivers/gpu/drm/msm/msm_drv.c:244:2: error: implicit declaration of function 'msm_perf_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration]
> drivers/gpu/drm/msm/msm_drv.c:245:2: error: implicit declaration of function 'msm_rd_debugfs_cleanup';did you mean 'msm_framebuffer_cleanup'? [-Werror=implicit-function-declaration]
>
> This adds empty stub implementations for that case.
>
> Fixes: 85eac4700ede ("drm/msm: Remove msm_debugfs_cleanup()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Pushed to drm-misc-next to patch up the .config fail.
Thanks, Daniel
> ---
> drivers/gpu/drm/msm/msm_drv.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
> index b51fb0d70f43..b885c3d5ae4d 100644
> --- a/drivers/gpu/drm/msm/msm_drv.h
> +++ b/drivers/gpu/drm/msm/msm_drv.h
> @@ -311,6 +311,8 @@ void msm_perf_debugfs_cleanup(struct msm_drm_private *priv);
> #else
> static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }
> static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}
> +static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {}
> +static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}
> #endif
>
> struct clk *msm_clk_get(struct platform_device *pdev, const char *name);
> --
> 2.9.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-20 10:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 9:39 [PATCH] drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup Arnd Bergmann
2017-03-20 9:59 ` Daniel Vetter
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).