diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 13:49:40 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-23 00:01:10 +0400 |
| commit | 3b6456d2c3fc9d0c4ec1db5d6594f40098ff0a6f (patch) | |
| tree | 9b4c29a45093004f734094f6246f5b4f543db936 | |
| parent | 3b8b487114c95ef6db5fef708ef69bfb5209014e (diff) | |
| download | linux-stable-3b6456d2c3fc9d0c4ec1db5d6594f40098ff0a6f.tar.gz linux-stable-3b6456d2c3fc9d0c4ec1db5d6594f40098ff0a6f.tar.bz2 linux-stable-3b6456d2c3fc9d0c4ec1db5d6594f40098ff0a6f.zip | |
zoran: don't bother with struct file * in zoran_map
all we need it for is file->private_data, which is assign-once, already
assigned by that point and, incidentally, its value is already in use
by zoran ->mmap() anyway. So just store that pointer instead...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | drivers/media/video/zoran/zoran.h | 4 | ||||
| -rw-r--r-- | drivers/media/video/zoran/zoran_driver.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index d7166afc255e..ca2754a3cd63 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h @@ -172,8 +172,10 @@ struct zoran_jpg_settings { struct v4l2_jpegcompression jpg_comp; /* JPEG-specific capture settings */ }; +struct zoran_fh; + struct zoran_mapping { - struct file *file; + struct zoran_fh *fh; int count; }; diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index c57310931810..c6ccdeb6d8d6 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c @@ -2811,7 +2811,7 @@ static void zoran_vm_close (struct vm_area_struct *vma) { struct zoran_mapping *map = vma->vm_private_data; - struct zoran_fh *fh = map->file->private_data; + struct zoran_fh *fh = map->fh; struct zoran *zr = fh->zr; int i; @@ -2938,7 +2938,7 @@ zoran_mmap (struct file *file, res = -ENOMEM; goto mmap_unlock_and_return; } - map->file = file; + map->fh = fh; map->count = 1; vma->vm_ops = &zoran_vm_ops; |