aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorBoris BREZILLON <boris.brezillon@free-electrons.com>2014-11-10 12:28:28 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-14 14:51:18 -0500
commit32b32ce84a02d5e3538941e71d2792ebbef8f795 (patch)
tree1907a874e8524a3b8653507cc4b7bab82b3b8d6d /include/media
parent55b8cbf75fe714f283073048b560d30a0af13473 (diff)
[media] Make use of the new media_bus_format definitions
Replace references to the v4l2_mbus_pixelcode enum with the new media_bus_format enum in all common headers. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-mediabus.h2
-rw-r--r--include/media/v4l2-subdev.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 395c4a95a42a..59d7397fb0ea 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -98,7 +98,7 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
98 98
99static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, 99static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
100 const struct v4l2_pix_format *pix_fmt, 100 const struct v4l2_pix_format *pix_fmt,
101 enum v4l2_mbus_pixelcode code) 101 u32 code)
102{ 102{
103 mbus_fmt->width = pix_fmt->width; 103 mbus_fmt->width = pix_fmt->width;
104 mbus_fmt->height = pix_fmt->height; 104 mbus_fmt->height = pix_fmt->height;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index d7465725773d..5860292d42eb 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -341,7 +341,7 @@ struct v4l2_subdev_video_ops {
341 int (*query_dv_timings)(struct v4l2_subdev *sd, 341 int (*query_dv_timings)(struct v4l2_subdev *sd,
342 struct v4l2_dv_timings *timings); 342 struct v4l2_dv_timings *timings);
343 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index, 343 int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
344 enum v4l2_mbus_pixelcode *code); 344 u32 *code);
345 int (*enum_mbus_fsizes)(struct v4l2_subdev *sd, 345 int (*enum_mbus_fsizes)(struct v4l2_subdev *sd,
346 struct v4l2_frmsizeenum *fsize); 346 struct v4l2_frmsizeenum *fsize);
347 int (*g_mbus_fmt)(struct v4l2_subdev *sd, 347 int (*g_mbus_fmt)(struct v4l2_subdev *sd,