Fix these warnings when CONFIG_MEDIA_CONTROLLER is not defined:
In file included from /home/hans/work/build/media-git/drivers/media/v4l2-core/v4l2-fh.c:32:0:
/home/hans/work/build/media-git/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)
^
/home/hans/work/build/media-git/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 /home/hans/work/build/media-git/include/media/tuner.h:23:0,
from /home/hans/work/build/media-git/drivers/media/tuners/tuner-types.c:9:
/home/hans/work/build/media-git/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)
^
/home/hans/work/build/media-git/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@xxxxxxxxx>
---
Please test without CONFIG_MEDIA_CONTROLLER or at least check the daily build results!
This is the second time I have to clean up a mistake in this header.
Regards,
Hans
---
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 5cbc209..311885e 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -170,17 +170,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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
