V4L/DVB (6314): saa7134: Replace list_for_each+list_entry with list_for_each_entry

A couple loops weren't changed because they expected the loop iterator
to be left as NULL if the list was empty.  Maybe the code should just
check for that first, then loop?

Adjust some of the loop logic to be simpler.

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

1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 7c97ac15e66..471b92793c1 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1285,26 +1285,24 @@ static int saa7134_resource(struct saa7134_fh *fh)
 static int video_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
-        struct saa7134_dev *h,*dev = NULL;
+        struct saa7134_dev *dev;
         struct saa7134_fh *fh;
-        struct list_head *list;
         enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int radio = 0;
-        list_for_each(list,&saa7134_devlist) {
-                h = list_entry(list, struct saa7134_dev, devlist);
-                if (h->video_dev && (h->video_dev->minor == minor))
-                        dev = h;
-                if (h->radio_dev && (h->radio_dev->minor == minor)) {
+        list_for_each_entry(dev, &saa7134_devlist, devlist) {
+                if (dev->video_dev && (dev->video_dev->minor == minor))
+                        goto found;
+                if (dev->radio_dev && (dev->radio_dev->minor == minor)) {
                         radio = 1;
-                        dev = h;
+                        goto found;
                 }
-                if (h->vbi_dev && (h->vbi_dev->minor == minor)) {
+                if (dev->vbi_dev && (dev->vbi_dev->minor == minor)) {
                         type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                        dev = h;
+                        goto found;
                 }
         }
-        if (NULL == dev)
-                return -ENODEV;
+        return -ENODEV;
+ found:
 
         dprintk("open minor=%d radio=%d type=%s\n",minor,radio,
                 v4l2_type_names[type]);