From 0d15252370ec4f82d4f8afe828c2671485fc84f5 Mon Sep 17 00:00:00 2001 From: Sanjana Sanikommu Date: Mon, 1 Apr 2019 19:26:37 +0530 Subject: [PATCH] staging: media: imx: Replace list_entry with list_for_each_entry_safe Challenge suggested by coccinelle. Replace use of the combination of list_empty() and list_entry() with list_for_each_entry_safe() to simplify the code. Issue found using below Coccinelle script. @@ expression E1; identifier I1, I2; type T; iterator name list_for_each_entry_safe; @@ T *I1; + T *tmp; ... - while (list_empty(&E1) == 0) + list_for_each_entry_safe (I1, tmp, &E1, I2) { ...when != T *I1; - I1 = list_entry(E1.next, T, I2); ... } Signed-off-by: Sanjana Sanikommu Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/imx/imx-media-capture.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index 9703c85b19c43..facce18975d8f 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -556,6 +556,7 @@ static void capture_stop_streaming(struct vb2_queue *vq) { struct capture_priv *priv = vb2_get_drv_priv(vq); struct imx_media_buffer *frame; + struct imx_media_buffer *tmp; unsigned long flags; int ret; @@ -570,9 +571,7 @@ static void capture_stop_streaming(struct vb2_queue *vq) /* release all active buffers */ spin_lock_irqsave(&priv->q_lock, flags); - while (!list_empty(&priv->ready_q)) { - frame = list_entry(priv->ready_q.next, - struct imx_media_buffer, list); + list_for_each_entry_safe(frame, tmp, &priv->ready_q, list) { list_del(&frame->list); vb2_buffer_done(&frame->vbuf.vb2_buf, VB2_BUF_STATE_ERROR); } -- 2.30.2