| Message ID | 20231012114642.19040-40-benjamin.gaignard@collabora.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add DELETE_BUF ioctl | expand |
On 12/10/2023 13:46, Benjamin Gaignard wrote: > Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> > CC: Henrik Rydberg <rydberg@bitmath.org> > --- > drivers/input/touchscreen/sur40.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > 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; This can just be dropped since this driver sets min_buffers_needed to 3. Regards, Hans > > if (*nplanes) > return sizes[0] < sur40->pix_fmt.sizeimage ? -EINVAL : 0;
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;
Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> CC: Henrik Rydberg <rydberg@bitmath.org> --- drivers/input/touchscreen/sur40.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)