From: Paul Kocialkowski <paulk@sys-base•io>
To: linux-media@vger•kernel.org,
linux-arm-kernel@lists•infradead.org,
linux-sunxi@lists•linux.dev, linux-kernel@vger•kernel.org,
linux-staging@lists•linux.dev
Cc: Paul Kocialkowski <paulk@sys-base•io>,
Mauro Carvalho Chehab <mchehab@kernel•org>,
Chen-Yu Tsai <wens@kernel•org>,
Jernej Skrabec <jernej.skrabec@gmail•com>,
Samuel Holland <samuel@sholland•org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Arash Golgol <arash.golgol@gmail•com>,
Laurent Pinchart <laurent.pinchart@ideasonboard•com>,
Nicolas Dufresne <nicolas.dufresne@collabora•com>
Subject: [PATCH 11/16] media: sun6i-csi: Tidy up and unify coding style
Date: Mon, 18 May 2026 12:24:46 +0200 [thread overview]
Message-ID: <20260518102451.417971-12-paulk@sys-base.io> (raw)
In-Reply-To: <20260518102451.417971-1-paulk@sys-base.io>
Bring recent changes to the same coding style as the rest of the driver.
This is purely cosmetic and no functional change is intended.
Signed-off-by: Paul Kocialkowski <paulk@sys-base•io>
---
.../sunxi/sun6i-csi/sun6i_csi_bridge.c | 16 ++---
.../sunxi/sun6i-csi/sun6i_csi_capture.c | 72 ++++++++++---------
2 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
index 43a85bcc2ba2..18f79075d3ad 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
@@ -473,6 +473,7 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)
unlock:
v4l2_subdev_unlock_state(state);
+
return ret;
}
@@ -533,7 +534,7 @@ static int sun6i_csi_bridge_set_fmt(struct v4l2_subdev *subdev,
struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
{
- struct v4l2_mbus_framefmt *fmt;
+ struct v4l2_mbus_framefmt *mbus_format;
/* The format on the source pad always matches the sink pad. */
if (format->pad != SUN6I_CSI_BRIDGE_PAD_SINK)
@@ -542,12 +543,12 @@ static int sun6i_csi_bridge_set_fmt(struct v4l2_subdev *subdev,
sun6i_csi_bridge_mbus_format_prepare(&format->format);
/* Set the format on the sink pad. */
- fmt = v4l2_subdev_state_get_format(state, format->pad);
- *fmt = format->format;
+ mbus_format = v4l2_subdev_state_get_format(state, format->pad);
+ *mbus_format = format->format;
/* Propagate the format to the source pad. */
- fmt = v4l2_subdev_state_get_format(state, SUN6I_CSI_BRIDGE_PAD_SOURCE);
- *fmt = format->format;
+ mbus_format = v4l2_subdev_state_get_format(state, SUN6I_CSI_BRIDGE_PAD_SOURCE);
+ *mbus_format = format->format;
return 0;
}
@@ -779,14 +780,12 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)
if (ret < 0)
return ret;
- /* V4L2 Subdev finalize */
+ /* V4L2 Subdev */
ret = v4l2_subdev_init_finalize(subdev);
if (ret < 0)
goto error_media_entity;
- /* V4L2 Subdev */
-
if (csi_dev->isp_available)
ret = v4l2_async_register_subdev(subdev);
else
@@ -846,7 +845,6 @@ void sun6i_csi_bridge_cleanup(struct sun6i_csi_device *csi_dev)
v4l2_async_nf_cleanup(notifier);
v4l2_device_unregister_subdev(subdev);
-
v4l2_subdev_cleanup(subdev);
media_entity_cleanup(&subdev->entity);
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
index 409c28621093..eea682f47eea 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
@@ -812,27 +812,6 @@ static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv,
return -EINVAL;
}
-static int sun6i_csi_capture_enum_framesize(struct file *file, void *fh,
- struct v4l2_frmsizeenum *fsize)
-{
- if (fsize->index)
- return -EINVAL;
-
- /* Only accept format in map table. */
- if (!sun6i_csi_capture_format_find(fsize->pixel_format))
- return -EINVAL;
-
- fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
- fsize->stepwise.min_width = SUN6I_CSI_CAPTURE_WIDTH_MIN;
- fsize->stepwise.max_width = SUN6I_CSI_CAPTURE_WIDTH_MAX;
- fsize->stepwise.min_height = SUN6I_CSI_CAPTURE_HEIGHT_MIN;
- fsize->stepwise.max_height = SUN6I_CSI_CAPTURE_HEIGHT_MAX;
- fsize->stepwise.step_width = 2;
- fsize->stepwise.step_height = 2;
-
- return 0;
-}
-
static int sun6i_csi_capture_g_fmt(struct file *file, void *priv,
struct v4l2_format *format)
{
@@ -867,6 +846,27 @@ static int sun6i_csi_capture_try_fmt(struct file *file, void *priv,
return 0;
}
+static int sun6i_csi_capture_enum_framesizes(struct file *file, void *fh,
+ struct v4l2_frmsizeenum *frmsize)
+{
+ if (frmsize->index)
+ return -EINVAL;
+
+ /* Only accept format in map table. */
+ if (!sun6i_csi_capture_format_find(frmsize->pixel_format))
+ return -EINVAL;
+
+ frmsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
+ frmsize->stepwise.min_width = SUN6I_CSI_CAPTURE_WIDTH_MIN;
+ frmsize->stepwise.max_width = SUN6I_CSI_CAPTURE_WIDTH_MAX;
+ frmsize->stepwise.min_height = SUN6I_CSI_CAPTURE_HEIGHT_MIN;
+ frmsize->stepwise.max_height = SUN6I_CSI_CAPTURE_HEIGHT_MAX;
+ frmsize->stepwise.step_width = 2;
+ frmsize->stepwise.step_height = 2;
+
+ return 0;
+}
+
static int sun6i_csi_capture_enum_input(struct file *file, void *priv,
struct v4l2_input *input)
{
@@ -900,11 +900,12 @@ static const struct v4l2_ioctl_ops sun6i_csi_capture_ioctl_ops = {
.vidioc_querycap = sun6i_csi_capture_querycap,
.vidioc_enum_fmt_vid_cap = sun6i_csi_capture_enum_fmt,
- .vidioc_enum_framesizes = sun6i_csi_capture_enum_framesize,
.vidioc_g_fmt_vid_cap = sun6i_csi_capture_g_fmt,
.vidioc_s_fmt_vid_cap = sun6i_csi_capture_s_fmt,
.vidioc_try_fmt_vid_cap = sun6i_csi_capture_try_fmt,
+ .vidioc_enum_framesizes = sun6i_csi_capture_enum_framesizes,
+
.vidioc_enum_input = sun6i_csi_capture_enum_input,
.vidioc_g_input = sun6i_csi_capture_g_input,
.vidioc_s_input = sun6i_csi_capture_s_input,
@@ -984,16 +985,17 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)
media_entity_to_video_device(link->sink->entity);
struct sun6i_csi_device *csi_dev = video_get_drvdata(video_dev);
struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev;
- struct v4l2_subdev *src_subdev =
+ struct v4l2_subdev *bridge_subdev =
media_entity_to_v4l2_subdev(link->source->entity);
const struct sun6i_csi_capture_format *capture_format;
const struct sun6i_csi_bridge_format *bridge_format;
unsigned int capture_width, capture_height;
- struct v4l2_subdev_format src_fmt = {
- .which = V4L2_SUBDEV_FORMAT_ACTIVE,
- .pad = link->source->index
+ unsigned int bridge_width, bridge_height;
+ struct v4l2_subdev_format bridge_subdev_format = {
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+ .pad = link->source->index,
};
- u32 pixelformat, capture_field;
+ u32 pixelformat, capture_field, mbus_code;
int ret;
sun6i_csi_capture_dimensions(csi_dev, &capture_width, &capture_height);
@@ -1004,21 +1006,25 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)
return -EINVAL;
/* Resolve csi bridge format. */
- ret = v4l2_subdev_call(src_subdev, pad, get_fmt, NULL, &src_fmt);
+ ret = v4l2_subdev_call(bridge_subdev, pad, get_fmt, NULL,
+ &bridge_subdev_format);
if (ret)
return ret;
- bridge_format = sun6i_csi_bridge_format_find(src_fmt.format.code);
+ bridge_width = bridge_subdev_format.format.width;
+ bridge_height = bridge_subdev_format.format.height;
+ mbus_code = bridge_subdev_format.format.code;
+
+ bridge_format = sun6i_csi_bridge_format_find(mbus_code);
if (WARN_ON(!bridge_format))
return -EINVAL;
/* No cropping/scaling is supported. */
- if (capture_width != src_fmt.format.width ||
- capture_height != src_fmt.format.height) {
+ if (capture_width != bridge_width || capture_height != bridge_height) {
v4l2_err(v4l2_dev,
"invalid input/output dimensions: %ux%u/%ux%u\n",
- src_fmt.format.width, src_fmt.format.height,
- capture_width, capture_height);
+ bridge_width, bridge_height, capture_width,
+ capture_height);
return -EINVAL;
}
--
2.54.0
next prev parent reply other threads:[~2026-05-18 10:30 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 10:24 [PATCH 00/16] media: sun6i-csi/isp MC-centric support and cleanups Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 01/16] media: sun6i-csi: bridge: Use V4L2 subdev active state Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 02/16] media: sun6i-csi: capture: Implement vidioc_enum_framesizes Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 03/16] media: sun6i-mipi-csi2: Use V4L2 subdev active state Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 04/16] media: sun8i-a83t-mipi-csi2: " Paul Kocialkowski
2026-05-18 14:09 ` Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 05/16] media: v4l2-common: Fix NV15_4L4 format info block height Paul Kocialkowski
2026-05-19 15:16 ` Nicolas Dufresne
2026-05-19 20:33 ` Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 06/16] media: v4l2-common: Add missing tiled format info block sizes Paul Kocialkowski
2026-05-19 15:18 ` Nicolas Dufresne
2026-05-19 20:37 ` Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 07/16] media: v4l2-common: Add NV12_16L16 pixel format to v4l2 format info Paul Kocialkowski
2026-05-19 15:22 ` Nicolas Dufresne
2026-05-18 10:24 ` [PATCH 08/16] media: v4l2-common: Add NV12_32L32 " Paul Kocialkowski
2026-05-19 15:23 ` Nicolas Dufresne
2026-05-18 10:24 ` [PATCH 09/16] media: sun6i-csi: Split format validation to a dedicated helper Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 10/16] media: sun6i-csi: Add support for MC-centric format enumeration Paul Kocialkowski
2026-05-27 5:50 ` arash golgol
2026-05-27 7:59 ` Paul Kocialkowski
2026-05-27 11:53 ` arash golgol
2026-05-18 10:24 ` Paul Kocialkowski [this message]
2026-05-18 10:24 ` [PATCH 12/16] media: sun6i-mipi-csi2: Fix parenthesis alignment Paul Kocialkowski
2026-05-18 10:24 ` [PATCH 13/16] media: sun6i-isp: Add dummy params link_validate implementation Paul Kocialkowski
2026-05-25 3:25 ` arash golgol
2026-05-18 10:24 ` [PATCH 14/16] media: sun6i-isp: Use V4L2 subdev active state Paul Kocialkowski
2026-05-21 9:23 ` arash golgol
2026-05-22 11:15 ` Paul Kocialkowski
2026-05-23 3:15 ` arash golgol
2026-05-18 10:24 ` [PATCH 15/16] media: sun6i-isp: Add support for MC-centric format enumeration Paul Kocialkowski
2026-05-28 7:35 ` arash golgol
2026-05-18 10:24 ` [PATCH 16/16] media: sun6i-isp: Add support for frame size enumeration Paul Kocialkowski
2026-05-23 4:34 ` arash golgol
2026-05-18 12:15 ` [PATCH 00/16] media: sun6i-csi/isp MC-centric support and cleanups Laurent Pinchart
2026-05-18 14:08 ` Paul Kocialkowski
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=20260518102451.417971-12-paulk@sys-base.io \
--to=paulk@sys-base$(echo .)io \
--cc=arash.golgol@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jernej.skrabec@gmail$(echo .)com \
--cc=laurent.pinchart@ideasonboard$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-staging@lists$(echo .)linux.dev \
--cc=linux-sunxi@lists$(echo .)linux.dev \
--cc=mchehab@kernel$(echo .)org \
--cc=nicolas.dufresne@collabora$(echo .)com \
--cc=samuel@sholland$(echo .)org \
--cc=wens@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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