summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa5249.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 13:32:09 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 13:36:54 +0200
commitc170ecf434bceb0e188b14a6deb3bfa3ec9ef699 (patch)
treefa62c2e14adeff72310c9a6b8cba675f3153feed /drivers/media/video/saa5249.c
parentV4L/DVB (8787): v4l2-dev: cleanups and add video_drvdata helper function (diff)
downloadlinux-c170ecf434bceb0e188b14a6deb3bfa3ec9ef699.tar.xz
linux-c170ecf434bceb0e188b14a6deb3bfa3ec9ef699.zip
V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)
Use the new video_drvdata(filp) function where it is safe to do so. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa5249.c')
-rw-r--r--drivers/media/video/saa5249.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index c784715a0b04..8517aa4f0681 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -319,8 +319,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
{
static int virtual_mode = false;
- struct video_device *vd = video_devdata(file);
- struct saa5249_device *t = video_get_drvdata(vd);
+ struct saa5249_device *t = video_drvdata(file);
switch(cmd)
{
@@ -618,8 +617,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
static int saa5249_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- struct video_device *vd = video_devdata(file);
- struct saa5249_device *t = video_get_drvdata(vd);
+ struct saa5249_device *t = video_drvdata(file);
int err;
cmd = vtx_fix_command(cmd);
@@ -631,8 +629,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
static int saa5249_open(struct inode *inode, struct file *file)
{
- struct video_device *vd = video_devdata(file);
- struct saa5249_device *t = video_get_drvdata(vd);
+ struct saa5249_device *t = video_drvdata(file);
int pgbuf;
if (t->client == NULL)
@@ -669,8 +666,7 @@ static int saa5249_open(struct inode *inode, struct file *file)
static int saa5249_release(struct inode *inode, struct file *file)
{
- struct video_device *vd = video_devdata(file);
- struct saa5249_device *t = video_get_drvdata(vd);
+ struct saa5249_device *t = video_drvdata(file);
i2c_senddata(t, 1, 0x20, -1); /* Turn off CCT */
i2c_senddata(t, 5, 3, 3, -1); /* Turn off TV-display */