Commit e5ee3f64 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab

V4L/DVB (10933): zoran: Pass zoran_fh pointers instead of file pointers

Many functions had a struct file pointer argument, but all they wants is
the struct zoran_fh pointer from the file's private data.  Since every
caller of those functions already has the zoran_fh, just pass the that
instead.  This saves a dereference in each function change.

While I'm at it, change the code formatting of affected functions to be
kernel standard style.
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ee9a9d66
...@@ -535,12 +535,8 @@ zr36057_overlay (struct zoran *zr, ...@@ -535,12 +535,8 @@ zr36057_overlay (struct zoran *zr,
* and the maximum window size is BUZ_MAX_WIDTH * BUZ_MAX_HEIGHT pixels. * and the maximum window size is BUZ_MAX_WIDTH * BUZ_MAX_HEIGHT pixels.
*/ */
void void write_overlay_mask(struct zoran_fh *fh, struct v4l2_clip *vp, int count)
write_overlay_mask (struct file *file,
struct v4l2_clip *vp,
int count)
{ {
struct zoran_fh *fh = file->private_data;
struct zoran *zr = fh->zr; struct zoran *zr = fh->zr;
unsigned mask_line_size = (BUZ_MAX_WIDTH + 31) / 32; unsigned mask_line_size = (BUZ_MAX_WIDTH + 31) / 32;
u32 *mask; u32 *mask;
......
...@@ -54,7 +54,7 @@ extern int jpeg_codec_reset(struct zoran *zr); ...@@ -54,7 +54,7 @@ extern int jpeg_codec_reset(struct zoran *zr);
/* zr360x7 access to raw capture */ /* zr360x7 access to raw capture */
extern void zr36057_overlay(struct zoran *zr, extern void zr36057_overlay(struct zoran *zr,
int on); int on);
extern void write_overlay_mask(struct file *file, extern void write_overlay_mask(struct zoran_fh *fh,
struct v4l2_clip *vp, struct v4l2_clip *vp,
int count); int count);
extern void zr36057_set_memgrab(struct zoran *zr, extern void zr36057_set_memgrab(struct zoran *zr,
......
This diff is collapsed.
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