Thread (18 messages) 18 messages, 5 authors, 2018-12-05
STALE2744d
Revisions (3)
  1. v1 [diff vs current]
  2. v2 [diff vs current]
  3. v3 current

[PATCH v3 6/9] media: v4l2-subdev: fix v4l2_subdev_get_try_* dependency

From: Marco Felsch <hidden>
Date: 2018-09-18 13:14:50
Also in: linux-media
Subsystem: media input infrastructure (v4l/dvb), the rest · Maintainers: Mauro Carvalho Chehab, Linus Torvalds

These helpers make us of the media-controller entity which is only
available if the CONFIG_MEDIA_CONTROLLER is enabled.

Signed-off-by: Marco Felsch <redacted>
---
Changelog:

v3:
- add CONFIG_MEDIA_CONTROLLER switch instead of moving the
  v4l2_subdev_get_try_* APIs into the existing one.

v2:
- Initial commit

 include/media/v4l2-subdev.h | 4 ++++
 1 file changed, 4 insertions(+)
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index ce48f1fcf295..d2479d5ebca8 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -912,6 +912,8 @@ struct v4l2_subdev_fh {
 #define to_v4l2_subdev_fh(fh)	\
 	container_of(fh, struct v4l2_subdev_fh, vfh)
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+
 /**
  * v4l2_subdev_get_try_format - ancillary routine to call
  *	&struct v4l2_subdev_pad_config->try_fmt
@@ -978,6 +980,8 @@ static inline struct v4l2_rect
 #endif
 }
 
+#endif
+
 extern const struct v4l2_file_operations v4l2_subdev_fops;
 
 /**
-- 
2.19.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help