This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/media_tree.git tree:
Subject: [media] v4l2-mc.h: fix yet more compiler errors Author: Hans Verkuil <[email protected]> Date: Fri Mar 4 05:46:58 2016 -0300 The newly added functions have an extra semicolon, which prevents compilation, and they need to be marked inline: In file included from ../include/media/tuner.h:23:0, from ../drivers/media/tuners/tuner-simple.c:10: ../include/media/v4l2-mc.h:233:1: error: expected identifier or '(' before '{' token Remove spurious return, remove copy-and-pasted semi-colons, add static inline. Fixes: a77bf7048add ("v4l2-mc.h: Add stubs for the V4L2 PM/pipeline routines") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]> include/media/v4l2-mc.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/cgit.cgi/media_tree.git/commit/?id=1e89f58499f3351a3b3c61dae8213fe3cd24a476 diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h index 96cfca9cd338..98a938aabdfb 100644 --- a/include/media/v4l2-mc.h +++ b/include/media/v4l2-mc.h @@ -221,7 +221,6 @@ static inline int v4l_enable_media_source(struct video_device *vdev) static inline void v4l_disable_media_source(struct video_device *vdev) { - return; } static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q) @@ -229,13 +228,13 @@ static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q) return 0; } -int v4l2_pipeline_pm_use(struct media_entity *entity, int use); +static inline int v4l2_pipeline_pm_use(struct media_entity *entity, int use) { return 0; } -int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, - unsigned int notification); +static inline int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, + unsigned int notification) { return 0; } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
