lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zoran: don't bother with struct file * in zoran_map

Browse Source 
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>
This commit is contained in:
Al Viro
2012-07-14 13:49:40 +04:00
parent 3b8b487114
commit 3b6456d2c3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/zoran/zoran.h
View File

@@ -172,8 +172,10 @@ struct zoran_jpg_settings {
struct v4l2_jpegcompression jpg_comp; /* JPEG-specific capture settings */ struct v4l2_jpegcompression jpg_comp; /* JPEG-specific capture settings */
}; };
struct zoran_fh;
struct zoran_mapping { struct zoran_mapping {
struct file *file; struct zoran_fh *fh;
int count; int count;
}; };

4
drivers/media/video/zoran/zoran_driver.c
View File

@@ -2811,7 +2811,7 @@ static void
zoran_vm_close (struct vm_area_struct *vma) zoran_vm_close (struct vm_area_struct *vma)
{ {
struct zoran_mapping *map = vma->vm_private_data; 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; struct zoran *zr = fh->zr;
int i; int i;
@@ -2938,7 +2938,7 @@ zoran_mmap (struct file *file,
res = -ENOMEM; res = -ENOMEM;
goto mmap_unlock_and_return; goto mmap_unlock_and_return;
} }
map->file = file; map->fh = fh;
map->count = 1; map->count = 1;
vma->vm_ops = &zoran_vm_ops; vma->vm_ops = &zoran_vm_ops;