summaryrefslogtreecommitdiff
path: root/linux/sound/i2c/other/tea575x-tuner.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/sound/i2c/other/tea575x-tuner.c')
-rw-r--r--linux/sound/i2c/other/tea575x-tuner.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c
index 0522b1266..2d07c8ea5 100644
--- a/linux/sound/i2c/other/tea575x-tuner.c
+++ b/linux/sound/i2c/other/tea575x-tuner.c
@@ -92,11 +92,10 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long data)
{
- struct video_device *dev = video_devdata(file);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
- tea575x_t *tea = video_get_drvdata(dev);
+ tea575x_t *tea = video_drvdata(file);
#else
- struct snd_tea575x *tea = video_get_drvdata(dev);
+ struct snd_tea575x *tea = video_drvdata(file);
#endif
void __user *arg = (void __user *)data;
@@ -188,11 +187,10 @@ static void snd_tea575x_release(struct video_device *vfd)
static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)
{
- struct video_device *dev = video_devdata(file);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
- tea575x_t *tea = video_get_drvdata(dev);
+ tea575x_t *tea = video_drvdata(file);
#else
- struct snd_tea575x *tea = video_get_drvdata(dev);
+ struct snd_tea575x *tea = video_drvdata(file);
#endif
return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0;
@@ -200,11 +198,10 @@ static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)
static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file)
{
- struct video_device *dev = video_devdata(file);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
- tea575x_t *tea = video_get_drvdata(dev);
+ tea575x_t *tea = video_drvdata(file);
#else
- struct snd_tea575x *tea = video_get_drvdata(dev);
+ struct snd_tea575x *tea = video_drvdata(file);
#endif
clear_bit(0, &tea->in_use);