| Message ID | 20170320093936.1255573-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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);
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(+)