UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: v4l2-common: Fix v4l2_fill_pixfmt[_mp]() prototypes 

Width/height and 4CC formats are expressed using u32 types everywhere,
let's fix the v4l2_fill_pixfmt[_mp]() prototypes to do the same.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Boris Brezillon 2019-05-28 13:02:17 -04:00 committed by Mauro Carvalho Chehab
parent 64b42d8eee
commit ce57a82f8a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/v4l2-core/v4l2-common.c
View File

@ -532,7 +532,7 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf
} }
int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,
int pixelformat, int width, int height) u32 pixelformat, u32 width, u32 height)
{ {
const struct v4l2_format_info *info; const struct v4l2_format_info *info;
struct v4l2_plane_pix_format *plane; struct v4l2_plane_pix_format *plane;
@ -586,7 +586,8 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,
} }
EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt_mp); EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt_mp);
int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, int pixelformat, int width, int height) int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat,
u32 width, u32 height)
{ {
const struct v4l2_format_info *info; const struct v4l2_format_info *info;
int i; int i;

8
include/media/v4l2-common.h
View File

@ -420,9 +420,9 @@ struct v4l2_format_info {
const struct v4l2_format_info *v4l2_format_info(u32 format); const struct v4l2_format_info *v4l2_format_info(u32 format);
int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, int pixelformat, int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat,
int width, int height); u32 width, u32 height);
int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, int pixelformat, int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, u32 pixelformat,
int width, int height); u32 width, u32 height);
#endif /* V4L2_COMMON_H_ */ #endif /* V4L2_COMMON_H_ */