media: v4l2-subdev: Don't use __u32 internally
authorJanusz Krzysztofik <jmkrzyszt@gmail.com>
Fri, 18 Oct 2019 15:31:40 +0000 (12:31 -0300)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Tue, 5 Nov 2019 11:57:48 +0000 (08:57 -0300)
Commit a8fa55078a77 ("media: v4l2-subdev: Verify arguments in
v4l2_subdev_call()") and commit 374d62e7aa50 ("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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/v4l2-core/v4l2-subdev.c

index f725cd9b66b964b92c47b20a4aeaa7d0e9d13277..9e987c0f840ec1a53c4ea767d1bda9a70ad62880 100644 (file)
@@ -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;