Commit 3b6456d2 authored by Al Viro's avatar Al Viro

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3b8b4871
...@@ -172,8 +172,10 @@ struct zoran_jpg_settings { ...@@ -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;
}; };
......
...@@ -2811,7 +2811,7 @@ static void ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment