Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
1e89f584 19137228

+3 -4
+3 -4
include/media/v4l2-mc.h
··· 221 221 222 222 static inline void v4l_disable_media_source(struct video_device *vdev) 223 223 { 224 - return; 225 224 } 226 225 227 226 static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q) ··· 228 229 return 0; 229 230 } 230 231 231 - int v4l2_pipeline_pm_use(struct media_entity *entity, int use); 232 + static inline int v4l2_pipeline_pm_use(struct media_entity *entity, int use) 232 233 { 233 234 return 0; 234 235 } 235 236 236 - int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, 237 - unsigned int notification); 237 + static inline int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, 238 + unsigned int notification) 238 239 { 239 240 return 0; 240 241 }