Commit 2a8145d4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (12841): tm6000: Fix compilation with newer v4l2-dev API 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent df7c1d9a

drivers/staging/tm6000/tm6000-video.c

+38 −34
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/version.h>

#include <linux/usb.h>

#include <linux/videodev2.h>

#include <media/v4l2-ioctl.h>

#include <linux/interrupt.h>

#include <linux/kthread.h>

#include <linux/highmem.h>
@@ -866,7 +867,7 @@ static int vidioc_querycap (struct file *file, void *priv, 
	return 0;

}



static int vidioc_enum_fmt_cap (struct file *file, void  *priv,

static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,

					struct v4l2_fmtdesc *f)

{

	if (unlikely(f->index >= ARRAY_SIZE(format)))
@@ -877,7 +878,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv, 
	return 0;

}



static int vidioc_g_fmt_cap (struct file *file, void *priv,

static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,

					struct v4l2_format *f)

{

	struct tm6000_fh  *fh=priv;
@@ -904,7 +905,7 @@ static struct tm6000_fmt* format_by_fourcc(unsigned int fourcc) 
	return NULL;

}



static int vidioc_try_fmt_cap (struct file *file, void *priv,

static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,

			struct v4l2_format *f)

{

	struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev;
@@ -946,12 +947,12 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, 
}



/*FIXME: This seems to be generic enough to be at videodev2 */

static int vidioc_s_fmt_cap (struct file *file, void *priv,

static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,

					struct v4l2_format *f)

{

	struct tm6000_fh  *fh=priv;

	struct tm6000_core *dev = fh->dev;

	int ret = vidioc_try_fmt_cap(file,fh,f);

	int ret = vidioc_try_fmt_vid_cap(file,fh,f);

	if (ret < 0)

		return (ret);
@@ -1435,18 +1436,12 @@ static struct file_operations tm6000_fops = { 
	.llseek         = no_llseek,

};



static struct video_device tm6000_template = {

	.name		= "tm6000",

	.type		= VID_TYPE_CAPTURE,

	.fops           = &tm6000_fops,

	.minor		= -1,

	.release	= video_device_release,



static const struct v4l2_ioctl_ops video_ioctl_ops = {

	.vidioc_querycap          = vidioc_querycap,

	.vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,

	.vidioc_g_fmt_cap     = vidioc_g_fmt_cap,

	.vidioc_try_fmt_cap   = vidioc_try_fmt_cap,

	.vidioc_s_fmt_cap     = vidioc_s_fmt_cap,

	.vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,

	.vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,

	.vidioc_try_fmt_vid_cap   = vidioc_try_fmt_vid_cap,

	.vidioc_s_fmt_vid_cap     = vidioc_s_fmt_vid_cap,

	.vidioc_s_std             = vidioc_s_std,

	.vidioc_enum_input        = vidioc_enum_input,

	.vidioc_g_input           = vidioc_g_input,
@@ -1467,9 +1462,18 @@ static struct video_device tm6000_template = { 
#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf              = vidiocgmbuf,

#endif

};



static struct video_device tm6000_template = {

	.name		= "tm6000",

	.fops           = &tm6000_fops,

	.ioctl_ops      = &video_ioctl_ops,

	.minor		= -1,

	.release	= video_device_release,

	.tvnorms        = TM6000_STD,

	.current_norm   = V4L2_STD_NTSC_M,

};



/* -----------------------------------------------------------------

	Initialization and module stuff

   ------------------------------------------------------------------*/