Commit b717c517 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

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: 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 16d6a345

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+0 −3
Original line number Diff line number Diff line
@@ -1888,9 +1888,6 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr) 
		    && 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__);

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+1 −2
Original line number Diff line number Diff line
@@ -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];

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/media/atomisp/pci/atomisp_subdev.h

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ struct atomisp_sub_device { 
	struct v4l2_ctrl *disable_dz;



	struct {

		struct ia_css_pipe *pipeline;

		struct completion acc_done;

	} acc;