Commit c50c9c1e authored by Kieran Bingham's avatar Kieran Bingham Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: queue: Simplify spin-lock usage 



Both uvc_start_streaming(), and uvc_stop_streaming() are called from
userspace context, with interrupts enabled. As such, they do not need to
save the IRQ state, and can use spin_lock_irq() and spin_unlock_irq()
respectively.

Signed-off-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent e829b262

drivers/media/usb/uvc/uvc_queue.c

+8 −6
Original line number Diff line number Diff line
@@ -169,18 +169,19 @@ static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) 
{

	struct uvc_video_queue *queue = vb2_get_drv_priv(vq);

	struct uvc_streaming *stream = uvc_queue_to_stream(queue);

	unsigned long flags;

	int ret;



	lockdep_assert_irqs_enabled();



	queue->buf_used = 0;



	ret = uvc_video_enable(stream, 1);

	if (ret == 0)

		return 0;



	spin_lock_irqsave(&queue->irqlock, flags);

	spin_lock_irq(&queue->irqlock);

	uvc_queue_return_buffers(queue, UVC_BUF_STATE_QUEUED);

	spin_unlock_irqrestore(&queue->irqlock, flags);

	spin_unlock_irq(&queue->irqlock);



	return ret;

}
@@ -188,14 +189,15 @@ static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) 
static void uvc_stop_streaming(struct vb2_queue *vq)

{

	struct uvc_video_queue *queue = vb2_get_drv_priv(vq);

	unsigned long flags;



	lockdep_assert_irqs_enabled();



	if (vq->type != V4L2_BUF_TYPE_META_CAPTURE)

		uvc_video_enable(uvc_queue_to_stream(queue), 0);



	spin_lock_irqsave(&queue->irqlock, flags);

	spin_lock_irq(&queue->irqlock);

	uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR);

	spin_unlock_irqrestore(&queue->irqlock, flags);

	spin_unlock_irq(&queue->irqlock);

}



static const struct vb2_ops uvc_queue_qops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE