Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: asc.acc.pipeline is always NULL

Browse Source 
With the removal of the ACC ioctls and atomisp_acc.c asc.acc.pipeline
never gets set, so it is always NULL.

Remove asc.acc.pipeline and drop checks for it being NULL / !NULL.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-22-hdegoede@redhat.com
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede 2022-06-15 21:50:18 +01:00 committed by Mauro Carvalho Chehab
parent 16d6a34503
commit b717c5175a
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@ -1888,9 +1888,6 @@ out:
&& isp->sw_contex.file_input)
v4l2_subdev_call(isp->inputs[asd->input_curr].camera,
video, s_stream, 1);
/* FIXME! FIX ACC implementation */
if (asd->acc.pipeline && css_pipe_done[asd->index])
atomisp_css_acc_done(asd);
}
dev_dbg(isp->dev, "<%s\n", __func__);

3
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
View File

@ -3857,8 +3857,7 @@ static struct atomisp_sub_device *__get_atomisp_subdev(
for (i = 0; i < isp->num_of_streams; i++) {
asd = &isp->asd[i];
if (asd->streaming == ATOMISP_DEVICE_STREAMING_DISABLED &&
!asd->acc.pipeline)
if (asd->streaming == ATOMISP_DEVICE_STREAMING_DISABLED)
continue;
for (j = 0; j < ATOMISP_INPUT_STREAM_NUM; j++) {
stream_env = &asd->stream_env[j];

6
drivers/staging/media/atomisp/pci/atomisp_ioctl.c
View File

@ -626,12 +626,6 @@ unsigned int atomisp_streaming_count(struct atomisp_device *isp)
unsigned int atomisp_is_acc_enabled(struct atomisp_device *isp)
{
unsigned int i;
for (i = 0; i < isp->num_of_streams; i++)
if (isp->asd[i].acc.pipeline)
return 1;
return 0;
}

1
drivers/staging/media/atomisp/pci/atomisp_subdev.h
View File

@ -323,7 +323,6 @@ struct atomisp_sub_device {
struct v4l2_ctrl *disable_dz;
struct {
struct ia_css_pipe *pipeline;
struct completion acc_done;
} acc;