Re: [PATCH 1/2] usb: gadget: uvc: clean and rename uvcg_queue_next_buffer to uvcg_complete_buffer

[Michael Grzeschik <mgr@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 3031 bytes --]

On Fri, Mar 11, 2022 at 04:04:44PM +0900, paul.elder@ideasonboard.com wrote:
>Thanks for the patch.
>
>On Mon, Feb 28, 2022 at 03:16:58PM +0100, Michael Grzeschik wrote:
>> The functions purpose is different to its name. We change the function
>> name and remove all unused code.
>>
>> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
>> ---
>>  drivers/usb/gadget/function/uvc_queue.c | 18 +-----------------
>>  drivers/usb/gadget/function/uvc_queue.h |  2 +-
>>  drivers/usb/gadget/function/uvc_video.c |  6 +++---
>>  3 files changed, 5 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
>> index d852ac9e47e72c..73ff56043d2e6a 100644
>> --- a/drivers/usb/gadget/function/uvc_queue.c
>> +++ b/drivers/usb/gadget/function/uvc_queue.c
>> @@ -326,24 +326,10 @@ int uvcg_queue_enable(struct uvc_video_queue *queue, int enable)
>>  }
>>
>>  /* called with &queue_irqlock held.. */
>> -struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
>> +void uvcg_complete_buffer(struct uvc_video_queue *queue,
>>  					  struct uvc_buffer *buf)
>>  {
>> -	struct uvc_buffer *nextbuf;
>> -
>> -	if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) &&
>> -	     buf->length != buf->bytesused) {
>> -		buf->state = UVC_BUF_STATE_QUEUED;
>> -		vb2_set_plane_payload(&buf->buf.vb2_buf, 0, 0);
>> -		return buf;
>> -	}
>> -
>>  	list_del(&buf->queue);
>> -	if (!list_empty(&queue->irqqueue))
>> -		nextbuf = list_first_entry(&queue->irqqueue, struct uvc_buffer,
>> -					   queue);
>> -	else
>> -		nextbuf = NULL;
>
>Is it fine to drop these? They look important to me. If they're not,
>then the reason should be explained in the commit message.

As UVC_QUEUE_DROP_INCOMPLETE is not used anywhere in the whole gadget,
removing it should be save. However this should probably be handled in
an extra patch before.

The pulling of nextbuf from the irequeue is done only to handover the
next_buffer like the functions purpose actually was intended for. Since
the function does not do this anymore, we can savely remove the code.

I will improve the description in v2.

>>
>>  	buf->buf.field = V4L2_FIELD_NONE;
>>  	buf->buf.sequence = queue->sequence++;
>> @@ -351,8 +337,6 @@ struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
>>
>>  	vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
>>  	vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
>> -
>> -	return nextbuf;
>
>This looks fine since all callers ignore it anyway.

Right, and beacause of that the above list_first_entry assignment can be
dropped.

Thanks,
Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]