Commit 3cbd3d99 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-subdev: Don't use __u32 internally 



Commit a8fa5507 ("media: v4l2-subdev: Verify arguments in
v4l2_subdev_call()") and commit 374d62e7 ("media: v4l2-subdev:
Verify v4l2_subdev_call() pad config argument") introduced a few local
functions, unfortunately with arguments of type __u32, reserved for use
in Linux uAPI.  Use u32 instead.

Suggested-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 704c6c80

drivers/media/v4l2-core/v4l2-subdev.c

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int subdev_close(struct file *file) 
	return 0;

}



static inline int check_which(__u32 which)

static inline int check_which(u32 which)

{

	if (which != V4L2_SUBDEV_FORMAT_TRY &&

	    which != V4L2_SUBDEV_FORMAT_ACTIVE)
@@ -121,7 +121,7 @@ static inline int check_which(__u32 which) 
	return 0;

}



static inline int check_pad(struct v4l2_subdev *sd, __u32 pad)

static inline int check_pad(struct v4l2_subdev *sd, u32 pad)

{

#if defined(CONFIG_MEDIA_CONTROLLER)

	if (sd->entity.num_pads) {
@@ -136,7 +136,7 @@ static inline int check_pad(struct v4l2_subdev *sd, __u32 pad) 
	return 0;

}



static int check_cfg(__u32 which, struct v4l2_subdev_pad_config *cfg)

static int check_cfg(u32 which, struct v4l2_subdev_pad_config *cfg)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY && !cfg)

		return -EINVAL;