Commit cd669be2 authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: zoran: Use video_drvdata to get struct zoran 



Using video_drvdata() is proper and shorter than using directly
fh pointers.

Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 109d5cc0

drivers/staging/media/zoran/zoran_driver.c

+14 −26
Original line number Diff line number Diff line
@@ -1320,8 +1320,7 @@ static int zoran_set_input(struct zoran *zr, int input) 


static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability *cap)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	strscpy(cap->card, ZR_DEVNAME(zr), sizeof(cap->card));

	strscpy(cap->driver, "zoran", sizeof(cap->driver));
@@ -1353,8 +1352,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) 
static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh,

				  struct v4l2_fmtdesc *f)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_CAPTURE);

}
@@ -1362,8 +1360,7 @@ static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh, 
static int zoran_enum_fmt_vid_out(struct file *file, void *__fh,

				  struct v4l2_fmtdesc *f)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_PLAYBACK);

}
@@ -1371,8 +1368,7 @@ static int zoran_enum_fmt_vid_out(struct file *file, void *__fh, 
static int zoran_enum_fmt_vid_overlay(struct file *file, void *__fh,

				      struct v4l2_fmtdesc *f)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	return zoran_enum_fmt(zr, f, ZORAN_FORMAT_OVERLAY);

}
@@ -1424,8 +1420,7 @@ static int zoran_g_fmt_vid_cap(struct file *file, void *__fh, 
static int zoran_g_fmt_vid_overlay(struct file *file, void *__fh,

				   struct v4l2_format *fmt)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	fmt->fmt.win.w.left = zr->overlay_settings.x;

	fmt->fmt.win.w.top = zr->overlay_settings.y;
@@ -1442,8 +1437,7 @@ static int zoran_g_fmt_vid_overlay(struct file *file, void *__fh, 
static int zoran_try_fmt_vid_overlay(struct file *file, void *__fh,

				     struct v4l2_format *fmt)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	if (fmt->fmt.win.w.width > BUZ_MAX_WIDTH)

		fmt->fmt.win.w.width = BUZ_MAX_WIDTH;
@@ -1647,8 +1641,8 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh, 
static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,

			       struct v4l2_format *fmt)

{

	struct zoran *zr = video_drvdata(file);

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	int i;

	int res = 0;
@@ -1696,8 +1690,7 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh, 
static int zoran_g_fbuf(struct file *file, void *__fh,

			struct v4l2_framebuffer *fb)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	memset(fb, 0, sizeof(*fb));

	fb->base = zr->vbuf_base;
@@ -1716,8 +1709,8 @@ static int zoran_g_fbuf(struct file *file, void *__fh, 
static int zoran_s_fbuf(struct file *file, void *__fh,

			const struct v4l2_framebuffer *fb)

{

	struct zoran *zr = video_drvdata(file);

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	int i, res = 0;

	__le32 printformat = __cpu_to_le32(fb->fmt.pixelformat);
@@ -2049,8 +2042,7 @@ static int zoran_streamoff(struct file *file, void *__fh, enum v4l2_buf_type typ 


static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	*std = zr->norm;

	return 0;
@@ -2058,8 +2050,7 @@ static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std) 


static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);

	int res = 0;



	res = zoran_set_norm(zr, std);
@@ -2073,8 +2064,7 @@ static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std) 
static int zoran_enum_input(struct file *file, void *__fh,

			    struct v4l2_input *inp)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	if (inp->index >= zr->card.inputs)

		return -EINVAL;
@@ -2090,8 +2080,7 @@ static int zoran_enum_input(struct file *file, void *__fh, 


static int zoran_g_input(struct file *file, void *__fh, unsigned int *input)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);



	*input = zr->input;
@@ -2100,8 +2089,7 @@ static int zoran_g_input(struct file *file, void *__fh, unsigned int *input) 


static int zoran_s_input(struct file *file, void *__fh, unsigned int input)

{

	struct zoran_fh *fh = __fh;

	struct zoran *zr = fh->zr;

	struct zoran *zr = video_drvdata(file);

	int res;



	res = zoran_set_input(zr, input);

CRA Git | Maintained and supported by SUSTech CRA and CCSE