[PATCH] v4l2-mc.h: fix yet more compiler errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---

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

---
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 96cfca9..98a938a 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;
 }
--
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



[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux