diff options
| author | Sammy He <r62914@freescale.com> | 2009-11-02 16:49:21 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-02-12 17:19:29 +0100 |
| commit | 80cf56f2e256ad90bcbdaf8c0bcd816bad7e7b77 (patch) | |
| tree | af7db17bf592ccb9cc53ee7ca77dcd43b1447a6d /drivers/media/video/mxc | |
| parent | d38a1e51cb9ff7f0bb88dbae8d9446907bb64c43 (diff) | |
ENGR00117951-1 Update csi v4l2 capture for 2.6.31 kernel
Update CSI V4L2 capture driver for 2.6.31 kernel.
Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'drivers/media/video/mxc')
| -rw-r--r-- | drivers/media/video/mxc/capture/csi_v4l2_capture.c | 17 | ||||
| -rw-r--r-- | drivers/media/video/mxc/capture/fsl_csi.h | 1 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/media/video/mxc/capture/csi_v4l2_capture.c b/drivers/media/video/mxc/capture/csi_v4l2_capture.c index 3266d2500081..d1781922e724 100644 --- a/drivers/media/video/mxc/capture/csi_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/csi_v4l2_capture.c @@ -342,13 +342,12 @@ exit: /*! * V4L interface - open function * - * @param inode structure inode * * @param file structure file * * * @return status 0 success, ENODEV invalid device instance, * ENODEV timeout, ERESTARTSYS interrupted by user */ -static int csi_v4l_open(struct inode *inode, struct file *file) +static int csi_v4l_open(struct file *file) { struct v4l2_ifparm ifparm; struct v4l2_format cam_fmt; @@ -390,12 +389,11 @@ oops: /*! * V4L interface - close function * - * @param inode struct inode * * @param file struct file * * * @return 0 success */ -static int csi_v4l_close(struct inode *inode, struct file *file) +static int csi_v4l_close(struct file *file) { struct video_device *dev = video_devdata(file); int err = 0; @@ -496,8 +494,6 @@ static ssize_t csi_v4l_read(struct file *file, char *buf, size_t count, /*! * V4L interface - ioctl function * - * @param inode struct inode* - * * @param file struct file* * * @param ioctlnr unsigned int @@ -507,7 +503,7 @@ static ssize_t csi_v4l_read(struct file *file, char *buf, size_t count, * @return 0 success, ENODEV for invalid device instance, * -1 for other errors. */ -static int csi_v4l_do_ioctl(struct inode *inode, struct file *file, +static long csi_v4l_do_ioctl(struct file *file, unsigned int ioctlnr, void *arg) { struct video_device *dev = video_devdata(file); @@ -650,10 +646,10 @@ static int csi_v4l_do_ioctl(struct inode *inode, struct file *file, * * @return None */ -static int csi_v4l_ioctl(struct inode *inode, struct file *file, +static long csi_v4l_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - return video_usercopy(inode, file, cmd, arg, csi_v4l_do_ioctl); + return video_usercopy(file, cmd, arg, csi_v4l_do_ioctl); } /*! @@ -701,7 +697,7 @@ csi_mmap_exit: /*! * This structure defines the functions to be called in this driver. */ -static struct file_operations csi_v4l_fops = { +static struct v4l2_file_operations csi_v4l_fops = { .owner = THIS_MODULE, .open = csi_v4l_open, .release = csi_v4l_close, @@ -712,7 +708,6 @@ static struct file_operations csi_v4l_fops = { static struct video_device csi_v4l_template = { .name = "Mx25 Camera", - .vfl_type = VID_TYPE_CAPTURE, .fops = &csi_v4l_fops, .release = video_device_release, }; diff --git a/drivers/media/video/mxc/capture/fsl_csi.h b/drivers/media/video/mxc/capture/fsl_csi.h index 41bfff03f07e..ee57597407f3 100644 --- a/drivers/media/video/mxc/capture/fsl_csi.h +++ b/drivers/media/video/mxc/capture/fsl_csi.h @@ -23,6 +23,7 @@ #define MX25_CSI_H #include <linux/io.h> +#include <mach/hardware.h> /* reset values */ #define CSICR1_RESET_VAL 0x40000800 |