V4L/DVB (6312): cx88: Replace list_for_each+list_entry with list_for_each_entry

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 5 insertions, 15 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 85609b41f86e..62e8dd24c5f5 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -1013,11 +1013,9 @@ struct video_device *cx88_vdev_init(struct cx88_core *core,
 struct cx88_core* cx88_core_get(struct pci_dev *pci)
 {
         struct cx88_core *core;
-        struct list_head *item;
 
         mutex_lock(&devlist);
-        list_for_each(item,&cx88_devlist) {
-                core = list_entry(item, struct cx88_core, devlist);
+        list_for_each_entry(core, &cx88_devlist, devlist) {
                 if (pci->bus->number != core->pci_bus)
                         continue;
                 if (PCI_SLOT(pci->devfn) != core->pci_slot)
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index aa40505c4b3a..babb08556406 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -99,7 +99,6 @@ int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
                              struct cx88_dmaqueue *q)
 {
         struct cx88_buffer *buf;
-        struct list_head *item;
 
         if (list_empty(&q->active))
                 return 0;
@@ -108,10 +107,8 @@ int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
         dprintk(2,"restart_queue [%p/%d]: restart dma\n",
                 buf, buf->vb.i);
         cx8800_start_vbi_dma(dev, q, buf);
-        list_for_each(item,&q->active) {
-                buf = list_entry(item, struct cx88_buffer, vb.queue);
+        list_for_each_entry(buf, &q->active, vb.queue)
                 buf->count = q->count++;
-        }
         mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 1439b7268532..231ae6c4dd22 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -466,17 +466,14 @@ static int restart_video_queue(struct cx8800_dev    *dev,
 {
         struct cx88_core *core = dev->core;
         struct cx88_buffer *buf, *prev;
-        struct list_head *item;
 
         if (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
                 dprintk(2,"restart_queue [%p/%d]: restart dma\n",
                         buf, buf->vb.i);
                 start_video_dma(dev, q, buf);
-                list_for_each(item,&q->active) {
-                        buf = list_entry(item, struct cx88_buffer, vb.queue);
-                        buf->count    = q->count++;
-                }
+                list_for_each_entry(buf, &q->active, vb.queue)
+                        buf->count = q->count++;
                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 return 0;
         }
@@ -713,12 +710,10 @@ static int video_open(struct inode *inode, struct file *file)
         struct cx8800_dev *h,*dev = NULL;
         struct cx88_core *core;
         struct cx8800_fh *fh;
-        struct list_head *list;
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
-        list_for_each(list,&cx8800_devlist) {
-                h = list_entry(list, struct cx8800_dev, devlist);
+        list_for_each_entry(h, &cx8800_devlist, devlist) {
                 if (h->video_dev->minor == minor) {
                         dev  = h;
                         type = V4L2_BUF_TYPE_VIDEO_CAPTURE;