summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2016-03-03 08:37:14 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 19:15:32 +0100
commit9532e6bbef87149f35de7f980f8bd61195936a78 (patch)
tree1543051671efabc2568ccba2e8d4909e0f388673
parent[media] media: au0828 audio mixer isn't connected to decoder (diff)
downloadlinux-9532e6bbef87149f35de7f980f8bd61195936a78.tar.xz
linux-9532e6bbef87149f35de7f980f8bd61195936a78.zip
[media] v4l2-mc.h: fix compiler warnings
Fix these warnings when CONFIG_MEDIA_CONTROLLER is not defined: In file included from drivers/media/v4l2-core/v4l2-fh.c:32:0: include/media/v4l2-mc.h:173:12: warning: 'v4l_enable_media_source' defined but not used [-Wunused-function] static int v4l_enable_media_source(struct video_device *vdev) ^ include/media/v4l2-mc.h:183:12: warning: 'v4l_vb2q_enable_media_source' defined but not used [-Wunused-function] static int v4l_vb2q_enable_media_source(struct vb2_queue *q) ^ In file included from include/media/tuner.h:23:0, from drivers/media/tuners/tuner-types.c:9: include/media/v4l2-mc.h:173:12: warning: 'v4l_enable_media_source' defined but not used [-Wunused-function] static int v4l_enable_media_source(struct video_device *vdev) ^ include/media/v4l2-mc.h:178:13: warning: 'v4l_disable_media_source' defined but not used [-Wunused-function] static void v4l_disable_media_source(struct video_device *vdev) ^ 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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 144b152e0362..96cfca9cd338 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -214,17 +214,17 @@ static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
return 0;
}
-static int v4l_enable_media_source(struct video_device *vdev)
+static inline int v4l_enable_media_source(struct video_device *vdev)
{
return 0;
}
-static void v4l_disable_media_source(struct video_device *vdev)
+static inline void v4l_disable_media_source(struct video_device *vdev)
{
return;
}
-static int v4l_vb2q_enable_media_source(struct vb2_queue *q)
+static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q)
{
return 0;
}