1 files changed, 15 insertions, 27 deletions

diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 1a737b64736..aedf04653e0 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -239,17 +239,14 @@ static int dsp_rec_stop(struct saa7134_dev *dev)
 static int dsp_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
-        struct saa7134_dev *h,*dev = NULL;
-        struct list_head *list;
+        struct saa7134_dev *dev;
         int err;
 
-        list_for_each(list,&saa7134_devlist) {
-                h = list_entry(list, struct saa7134_dev, devlist);
-                if (h->dmasound.minor_dsp == minor)
-                        dev = h;
-        }
-        if (NULL == dev)
-                return -ENODEV;
+        list_for_each_entry(dev, &saa7134_devlist, devlist)
+                if (dev->dmasound.minor_dsp == minor)
+                        goto found;
+        return -ENODEV;
+ found:
 
         mutex_lock(&dev->dmasound.lock);
         err = -EBUSY;
@@ -680,19 +677,14 @@ mixer_level(struct saa7134_dev *dev, enum saa7134_audio_in src, int level)
 static int mixer_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
-        struct saa7134_dev *h,*dev = NULL;
-        struct list_head *list;
+        struct saa7134_dev *dev;
 
-        list_for_each(list,&saa7134_devlist) {
-                h = list_entry(list, struct saa7134_dev, devlist);
-                if (h->dmasound.minor_mixer == minor)
-                        dev = h;
-        }
-        if (NULL == dev)
-                return -ENODEV;
-
-        file->private_data = dev;
-        return 0;
+        list_for_each_entry(dev, &saa7134_devlist, devlist)
+                if (dev->dmasound.minor_mixer == minor) {
+                        file->private_data = dev;
+                        return 0;
+                }
+        return -ENODEV;
 }
 
 static int mixer_release(struct inode *inode, struct file *file)
@@ -1022,18 +1014,14 @@ static int saa7134_oss_init(void)
 
 static void saa7134_oss_exit(void)
 {
-        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
-
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+        struct saa7134_dev *dev;
 
+        list_for_each_entry(dev, &saa7134_devlist, devlist) {
                 /* Device isn't registered by OSS, probably ALSA's */
                 if (!dev->dmasound.minor_dsp)
                         continue;
 
                 oss_device_exit(dev);
-
         }
 
         saa7134_dmasound_init = NULL;