iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: sun6i-csi: Get mbus code from bridge instead of storing it

Browse Source 
Another instance of removing a duplicated variable and using common
helpers instead.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Paul Kocialkowski 2022-11-03 16:30:58 +00:00 committed by Mauro Carvalho Chehab
parent 90449f4269
commit 83b1356bbc
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
View File

@ -17,6 +17,7 @@
#include <media/videobuf2-v4l2.h>
#include "sun6i_csi.h"
#include "sun6i_csi_bridge.h"
#include "sun6i_csi_capture.h"
#include "sun6i_csi_reg.h"
@ -455,20 +456,20 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)
static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev)
{
struct sun6i_csi_capture *capture = &csi_dev->capture;
u32 pixelformat, field;
u32 mbus_code, pixelformat, field;
u32 cfg = 0;
u32 val;
sun6i_csi_capture_format(csi_dev, &pixelformat, &field);
sun6i_csi_bridge_format(csi_dev, &mbus_code, NULL);
val = get_csi_input_format(csi_dev, capture->mbus_code, pixelformat);
val = get_csi_input_format(csi_dev, mbus_code, pixelformat);
cfg |= SUN6I_CSI_CH_CFG_INPUT_FMT(val);
val = get_csi_output_format(csi_dev, pixelformat, field);
cfg |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(val);
val = get_csi_input_seq(csi_dev, capture->mbus_code, pixelformat);
val = get_csi_input_seq(csi_dev, mbus_code, pixelformat);
cfg |= SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ(val);
if (field == V4L2_FIELD_TOP)
@ -739,11 +740,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,
if (ret < 0)
goto error_state;
if (capture->mbus_code == 0) {
ret = -EINVAL;
goto error_media_pipeline;
}
subdev = sun6i_csi_capture_remote_subdev(capture, NULL);
if (!subdev) {
ret = -EINVAL;
@ -1072,8 +1068,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)
struct v4l2_subdev_format source_fmt;
int ret;
capture->mbus_code = 0;
if (!media_pad_remote_pad_first(link->sink->entity->pads)) {
dev_info(csi_dev->dev, "capture node %s pad not connected\n",
vdev->name);
@ -1105,8 +1099,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)
return -EPIPE;
}
capture->mbus_code = source_fmt.format.code;
return 0;
}

1
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
View File

@ -39,7 +39,6 @@ struct sun6i_csi_capture {
struct media_pad pad;
struct v4l2_format format;
u32 mbus_code;
};
void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,