media: ipu6: Drop error argument from ipu6_isys_stream_start()

error argument for ipu6_isys_stream_start() is always false, remove the
argument. The IPU6_ISYS_BUFFER_LIST_FL_SET_STATE buffer flag also becomes
redundant as a result, remove it as well.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
Tested-by: Mehdi Djait <mehdi.djait@linux.intel.com> # Dell XPS 9315
Reviewed-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
index dcad6aafee294341f5bc79953e1c849fbb6513d7..0e9f0025aeb3d7ebbde2fd9a23169a236bc4b728 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
@@ -132,9 +132,6 @@ void ipu6_isys_buffer_list_queue(struct ipu6_isys_buffer_list *bl,
                        list_add_tail(&ib->head, &aq->incoming);
                spin_unlock_irqrestore(&aq->lock, flags);
 
-               if (op_flags & IPU6_ISYS_BUFFER_LIST_FL_SET_STATE)
-                       vb2_buffer_done(vb, state);
-
                if (first) {
                        dev_dbg(dev,
                                "queue buf list %p flags %lx, s %d, %d bufs\n",
@@ -290,7 +287,7 @@ ipu6_isys_buf_to_fw_frame_buf(struct ipu6_fw_isys_frame_buff_set_abi *set,
 
 /* Start streaming for real. The buffer list must be available. */
 static int ipu6_isys_stream_start(struct ipu6_isys_video *av,
-                                 struct ipu6_isys_buffer_list *bl, bool error)
+                                 struct ipu6_isys_buffer_list *bl)
 {
        struct ipu6_isys_stream *stream = av->stream;
        struct device *dev = &stream->isys->adev->auxdev.dev;
@@ -336,10 +333,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av,
 out_requeue:
        if (bl && bl->nbufs)
                ipu6_isys_buffer_list_queue(bl,
-                                           IPU6_ISYS_BUFFER_LIST_FL_INCOMING |
-                                           (error ?
-                                           IPU6_ISYS_BUFFER_LIST_FL_SET_STATE :
-                                            0), error ? VB2_BUF_STATE_ERROR :
+                                           IPU6_ISYS_BUFFER_LIST_FL_INCOMING,
                                            VB2_BUF_STATE_QUEUED);
        flush_firmware_streamon_fail(stream);
 
@@ -590,7 +584,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)
                goto out;
        }
 
-       ret = ipu6_isys_stream_start(av, bl, false);
+       ret = ipu6_isys_stream_start(av, bl);
        if (ret)
                goto out_stream_start;
 

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.h b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.h
index 844dfda15ab615eef3a8aee8dde96e590ded9115..dec1fed44dd24532eb7e514b5477002686843db6 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.h
@@ -39,7 +39,6 @@ struct ipu6_isys_video_buffer {
 
 #define IPU6_ISYS_BUFFER_LIST_FL_INCOMING      BIT(0)
 #define IPU6_ISYS_BUFFER_LIST_FL_ACTIVE        BIT(1)
-#define IPU6_ISYS_BUFFER_LIST_FL_SET_STATE     BIT(2)
 
 struct ipu6_isys_buffer_list {
        struct list_head head;