From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
tomi.valkeinen@ideasonboard.com, jacopo.mondi@ideasonboard.com,
bingbu.cao@intel.com, hongju.wang@intel.com,
Alain Volmat <alain.volmat@foss.st.com>
Subject: [PATCH v5 4/8] media: v4l: subdev: v4l2_subdev_state_get_format always returns format now
Date: Fri, 27 Oct 2023 12:59:09 +0300 [thread overview]
Message-ID: <20231027095913.1010187-5-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20231027095913.1010187-1-sakari.ailus@linux.intel.com>
Now that v4l2_subdev_state_get_format() always returns format, don't call
alternative v4l2_subdev_get_pad_format() anymore.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
drivers/media/v4l2-core/v4l2-subdev.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 0d5e749d8f99..76e1a002fcdd 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1580,14 +1580,7 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
{
struct v4l2_mbus_framefmt *fmt;
- if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
- fmt = v4l2_subdev_state_get_format(state, format->pad,
- format->stream);
- else if (format->pad < sd->entity.num_pads && format->stream == 0)
- fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
- else
- fmt = NULL;
-
+ fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
if (!fmt)
return -EINVAL;
--
2.39.2
next prev parent reply other threads:[~2023-10-27 9:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 9:59 [PATCH v5 0/8] Unify sub-device state access functions Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 1/8] media: v4l: subdev: Store the sub-device in the sub-device state Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 2/8] media: v4l: subdev: Also return pads array information on stream functions Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 3/8] media: v4l: subdev: Rename sub-device state information access functions Sakari Ailus
2023-10-27 9:59 ` Sakari Ailus [this message]
2023-10-27 9:59 ` [PATCH v5 5/8] media: v4l: subdev: Make stream argument optional in state " Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 6/8] media: v4l: subdev: Switch to stream-aware state functions Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 7/8] media: v4l: subdev: Remove stream-unaware sub-device state access Sakari Ailus
2023-10-27 9:59 ` [PATCH v5 8/8] media: v4l: subdev: Return NULL from pad access functions on error Sakari Ailus
2023-10-27 10:03 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231027095913.1010187-5-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=alain.volmat@foss.st.com \
--cc=bingbu.cao@intel.com \
--cc=hongju.wang@intel.com \
--cc=hverkuil@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox