Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-block.git] / drivers / media / video / tvmixer.c

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 9e86caeb96a7b530da89b05e18a0cb44d53d7865..3ae5a9cd2e28f1388f526acacdd0bb00e79cd7e5 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -4,7 +4,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
@@ -198,10 +197,6 @@ static int tvmixer_open(struct inode *inode, struct file *file)
 
        /* lock bttv in memory while the mixer is in use  */
        file->private_data = mix;
-#ifndef I2C_PEC
-       if (client->adapter->inc_use)
-               client->adapter->inc_use(client->adapter);
-#endif
        if (client->adapter->owner)
                try_module_get(client->adapter->owner);
        return 0;
@@ -217,12 +212,7 @@ static int tvmixer_release(struct inode *inode, struct file *file)
                return -ENODEV;
        }
 
-#ifndef I2C_PEC
-       if (client->adapter->dec_use)
-               client->adapter->dec_use(client->adapter);
-#endif
-       if (client->adapter->owner)
-               module_put(client->adapter->owner);
+       module_put(client->adapter->owner);
        return 0;
 }
 
@@ -236,7 +226,7 @@ static struct i2c_driver driver = {
        .detach_client   = tvmixer_clients,
 };
 
-static struct file_operations tvmixer_fops = {
+static const struct file_operations tvmixer_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .ioctl          = tvmixer_ioctl,