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

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>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 18f063393433c10eba489c8708eb451495088919..d8b3896a267ae972f7341745f6a0ac224d0d65f9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -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__);
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 51b31e6c4811b2e94db5543e86588362d9f32847..646404a71d18b015d23789b5fc2a7a45ce25b3ee 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -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];

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 69deeb55613f90eb0d4f6ae0308d6c545a807f36..725b3b1562b14b3319117f3cfb322fc4281f177e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -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;
 }
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
index f1e87c3a9dfa484345228918ef9d373fe98713c2..f611fd47b85d65df62384fccd29bc159734fa531 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
@@ -323,7 +323,6 @@ struct atomisp_sub_device {
        struct v4l2_ctrl *disable_dz;
 
        struct {
-               struct ia_css_pipe *pipeline;
                struct completion acc_done;
        } acc;