[v13,33/56] touchscreen: sur40: Stop direct calls to queue num_buffers field

Commit Message

Benjamin Gaignard Oct. 19, 2023, 12:51 p.m. UTC

Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.

Signed-off-by: Benjamin Gaignard <[e-mail]>
CC: Dmitry Torokhov <[e-mail]>
CC: Henrik Rydberg <[e-mail]>
---
 drivers/input/touchscreen/sur40.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Oct. 29, 2023, 2:29 a.m. UTC | #1

On Thu, Oct 19, 2023 at 02:51:59PM +0200, Benjamin Gaignard wrote:
> Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
> This allows us to change how the number of buffers is computed in the
> future.
> 
> Signed-off-by: Benjamin Gaignard <[e-mail]>
> CC: Dmitry Torokhov <[e-mail]>
> CC: Henrik Rydberg <[e-mail]>

Acked-by: Dmitry Torokhov <[e-mail]>

Feel free to merge with the rest of the series.

Thanks.

Patch

diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 8ddb3f7d307a..e7d2a52169a0 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -847,9 +847,10 @@  static int sur40_queue_setup(struct vb2_queue *q,
 		       unsigned int sizes[], struct device *alloc_devs[])
 {
 	struct sur40_state *sur40 = vb2_get_drv_priv(q);
+	unsigned int q_num_bufs = vb2_get_num_buffers(q);
 
-	if (q->num_buffers + *nbuffers < 3)
-		*nbuffers = 3 - q->num_buffers;
+	if (q_num_bufs + *nbuffers < 3)
+		*nbuffers = 3 - q_num_bufs;
 
 	if (*nplanes)
 		return sizes[0] < sur40->pix_fmt.sizeimage ? -EINVAL : 0;