media: subdev: Drop implicit zeroing of stream field
authorTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Mon, 19 Jun 2023 11:27:05 +0000 (13:27 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Thu, 10 Aug 2023 05:58:38 +0000 (07:58 +0200)
Now that the kernel drivers have been fixed to initialize the stream
field, and we have the client capability which the userspace uses to say
it has initialized the stream field, we can drop the implicit zeroing of
the stream field in the various check functions.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/v4l2-core/v4l2-subdev.c

index 217b801..c720c9e 100644 (file)
@@ -200,9 +200,6 @@ static inline int check_format(struct v4l2_subdev *sd,
        if (!format)
                return -EINVAL;
 
-       if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
-               format->stream = 0;
-
        return check_which(format->which) ? : check_pad(sd, format->pad) ? :
               check_state(sd, state, format->which, format->pad, format->stream);
 }
@@ -230,9 +227,6 @@ static int call_enum_mbus_code(struct v4l2_subdev *sd,
        if (!code)
                return -EINVAL;
 
-       if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
-               code->stream = 0;
-
        return check_which(code->which) ? : check_pad(sd, code->pad) ? :
               check_state(sd, state, code->which, code->pad, code->stream) ? :
               sd->ops->pad->enum_mbus_code(sd, state, code);
@@ -245,9 +239,6 @@ static int call_enum_frame_size(struct v4l2_subdev *sd,
        if (!fse)
                return -EINVAL;
 
-       if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
-               fse->stream = 0;
-
        return check_which(fse->which) ? : check_pad(sd, fse->pad) ? :
               check_state(sd, state, fse->which, fse->pad, fse->stream) ? :
               sd->ops->pad->enum_frame_size(sd, state, fse);
@@ -283,9 +274,6 @@ static int call_enum_frame_interval(struct v4l2_subdev *sd,
        if (!fie)
                return -EINVAL;
 
-       if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
-               fie->stream = 0;
-
        return check_which(fie->which) ? : check_pad(sd, fie->pad) ? :
               check_state(sd, state, fie->which, fie->pad, fie->stream) ? :
               sd->ops->pad->enum_frame_interval(sd, state, fie);
@@ -298,9 +286,6 @@ static inline int check_selection(struct v4l2_subdev *sd,
        if (!sel)
                return -EINVAL;
 
-       if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
-               sel->stream = 0;
-
        return check_which(sel->which) ? : check_pad(sd, sel->pad) ? :
               check_state(sd, state, sel->which, sel->pad, sel->stream);
 }