diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2016-03-04 05:46:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-04 07:56:43 -0300 |
| commit | 1e89f58499f3351a3b3c61dae8213fe3cd24a476 (patch) | |
| tree | f367358a12cbe13a6603b1f32a88e6c6993bd2fc | |
| parent | 1913722808e79ded46b3bd9ab5de5657faecc8d9 (diff) | |
| download | linux-stable-1e89f58499f3351a3b3c61dae8213fe3cd24a476.tar.gz linux-stable-1e89f58499f3351a3b3c61dae8213fe3cd24a476.tar.bz2 linux-stable-1e89f58499f3351a3b3c61dae8213fe3cd24a476.zip | |
[media] v4l2-mc.h: fix yet more compiler errors
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 <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | include/media/v4l2-mc.h | 7 |
1 files changed, 3 insertions, 4 deletions
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; } |