Skip to contentSkip to conversation

v4l2-mc.h: fix yet more compiler errors

PATCH New Hans Verkuil 1 participant 1 message Mar 4, 2016 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l2-mc.h: fix yet more compiler errors

Remove spurious return, remove copy-and-pasted semi-colons, add static inline.

---

Third time in quick succession that these stubs are messed up. Please do a build without CONFIG_MEDIA_CONTROLLER before merging!

---

include/media/v4l2-mc.h +3 -4
index 96cfca9..98a938a 100644
@@ -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;
 }