Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / drivers / media / video / tvmixer.c

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 3ae5a9cd2e28f1388f526acacdd0bb00e79cd7e5..9fa5b702e0736ddfc99b26177bae0c547aefd70d 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -2,7 +2,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -238,13 +237,10 @@ static const struct file_operations tvmixer_fops = {
 
 static int tvmixer_adapters(struct i2c_adapter *adap)
 {
-       struct list_head  *item;
        struct i2c_client *client;
 
-       list_for_each(item,&adap->clients) {
-               client = list_entry(item, struct i2c_client, list);
+       list_for_each_entry(client, &adap->clients, list)
                tvmixer_clients(client);
-       }
        return 0;
 }