Commit 45b4ab38 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

media: atomisp: Remove atomisp_video_init() parametrization

Now that we only have a single /dev/video# node it is no longer
necessary for atomisp_video_init() to be parametrized.

Remove its parameters and while at it also change the name
from the single /dev/video# node from "ATOMISP ISP PREVIEW output"
to "ATOMISP video output".

Link: https://lore.kernel.org/r/20230518153733.195306-4-hdegoede@redhat.comReviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 9af6100f
...@@ -537,7 +537,7 @@ static int atomisp_open(struct file *file) ...@@ -537,7 +537,7 @@ static int atomisp_open(struct file *file)
atomisp_subdev_init_struct(asd); atomisp_subdev_init_struct(asd);
/* Ensure that a mode is set */ /* Ensure that a mode is set */
v4l2_ctrl_s_ctrl(asd->run_mode, pipe->default_run_mode); v4l2_ctrl_s_ctrl(asd->run_mode, ATOMISP_RUN_MODE_PREVIEW);
pipe->users++; pipe->users++;
mutex_unlock(&isp->mutex); mutex_unlock(&isp->mutex);
......
...@@ -898,7 +898,7 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd) ...@@ -898,7 +898,7 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd)
if (ret) if (ret)
return ret; return ret;
ret = atomisp_video_init(&asd->video_out, "PREVIEW", ATOMISP_RUN_MODE_PREVIEW); ret = atomisp_video_init(&asd->video_out);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -67,8 +67,6 @@ struct atomisp_video_pipe { ...@@ -67,8 +67,6 @@ struct atomisp_video_pipe {
/* Filled through atomisp_get_css_frame_info() on queue setup */ /* Filled through atomisp_get_css_frame_info() on queue setup */
struct ia_css_frame_info frame_info; struct ia_css_frame_info frame_info;
/* Store here the initial run mode */
unsigned int default_run_mode;
/* Set from streamoff to disallow queuing further buffers in CSS */ /* Set from streamoff to disallow queuing further buffers in CSS */
bool stopping; bool stopping;
......
...@@ -333,34 +333,22 @@ const struct atomisp_dfs_config dfs_config_cht_soc = { ...@@ -333,34 +333,22 @@ const struct atomisp_dfs_config dfs_config_cht_soc = {
.dfs_table_size = ARRAY_SIZE(dfs_rules_cht_soc), .dfs_table_size = ARRAY_SIZE(dfs_rules_cht_soc),
}; };
int atomisp_video_init(struct atomisp_video_pipe *video, const char *name, int atomisp_video_init(struct atomisp_video_pipe *video)
unsigned int run_mode)
{ {
int ret; int ret;
const char *direction;
switch (video->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
direction = "output";
video->pad.flags = MEDIA_PAD_FL_SINK;
video->vdev.fops = &atomisp_fops;
video->vdev.ioctl_ops = &atomisp_ioctl_ops;
video->vdev.lock = &video->isp->mutex;
break;
default:
return -EINVAL;
}
video->pad.flags = MEDIA_PAD_FL_SINK;
ret = media_entity_pads_init(&video->vdev.entity, 1, &video->pad); ret = media_entity_pads_init(&video->vdev.entity, 1, &video->pad);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Initialize the video device. */ /* Initialize the video device. */
snprintf(video->vdev.name, sizeof(video->vdev.name), strscpy(video->vdev.name, "ATOMISP video output", sizeof(video->vdev.name));
"ATOMISP ISP %s %s", name, direction); video->vdev.fops = &atomisp_fops;
video->vdev.ioctl_ops = &atomisp_ioctl_ops;
video->vdev.lock = &video->isp->mutex;
video->vdev.release = video_device_release_empty; video->vdev.release = video_device_release_empty;
video_set_drvdata(&video->vdev, video->isp); video_set_drvdata(&video->vdev, video->isp);
video->default_run_mode = run_mode;
return 0; return 0;
} }
......
...@@ -26,8 +26,7 @@ struct v4l2_device; ...@@ -26,8 +26,7 @@ struct v4l2_device;
struct atomisp_device; struct atomisp_device;
struct firmware; struct firmware;
int atomisp_video_init(struct atomisp_video_pipe *video, const char *name, int atomisp_video_init(struct atomisp_video_pipe *video);
unsigned int run_mode);
void atomisp_video_unregister(struct atomisp_video_pipe *video); void atomisp_video_unregister(struct atomisp_video_pipe *video);
const struct firmware *atomisp_load_firmware(struct atomisp_device *isp); const struct firmware *atomisp_load_firmware(struct atomisp_device *isp);
int atomisp_csi_lane_config(struct atomisp_device *isp); int atomisp_csi_lane_config(struct atomisp_device *isp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment