Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b6456d2 authored Jul 14, 2012 by 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: Al Viro <viro@zeniv.linux.org.uk>

parent 3b8b4871

drivers/media/video/zoran/zoran.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		};

drivers/media/video/zoran/zoran_driver.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;