Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 124129
b: refs/heads/master
c: f473bf7
h: refs/heads/master
i:
  124127: 455fcaa
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Dec 29, 2008
1 parent 2bd6065 commit 85db8ba
Show file tree
Hide file tree
Showing 27 changed files with 58 additions and 103 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bef216b7edb0fac356565dea4bd65131bf6f9c4a
refs/heads/master: f473bf76c71ca734a16f9331ce6b6e9603641888
2 changes: 1 addition & 1 deletion trunk/drivers/media/common/saa7146_fops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
/*
DEB_EE(("inode:%p, file:%p, cmd:%d, arg:%li\n",inode, file, cmd, arg));
*/
return video_usercopy(inode, file, cmd, arg, saa7146_video_do_ioctl);
return video_usercopy(file, cmd, arg, saa7146_video_do_ioctl);
}

static int fops_mmap(struct file *file, struct vm_area_struct * vma)
Expand Down
10 changes: 2 additions & 8 deletions trunk/drivers/media/common/saa7146_video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file)
* copying is done already, arg is a kernel pointer.
*/

static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
Expand Down Expand Up @@ -1216,17 +1216,11 @@ static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *a
#endif
default:
return v4l_compat_translate_ioctl(file, cmd, arg,
__saa7146_video_do_ioctl);
saa7146_video_do_ioctl);
}
return 0;
}

int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
{
return __saa7146_video_do_ioctl(file, cmd, arg);
}

/*********************************************************************************/
/* buffer handling functions */

Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/arv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,7 @@ static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
return ret;
}

static int ar_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
struct ar_device *ar = video_get_drvdata(dev);
Expand Down Expand Up @@ -543,7 +542,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file,
static int ar_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, ar_do_ioctl);
return video_usercopy(file, cmd, arg, ar_do_ioctl);
}

#if USE_INT
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/bw-qcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
* Video4linux interfacing
*/

static int qcam_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam=(struct qcam_device *)dev;
Expand Down Expand Up @@ -867,7 +866,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
static int qcam_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl);
return video_usercopy(file, cmd, arg, qcam_do_ioctl);
}

static ssize_t qcam_read(struct file *file, char __user *buf,
Expand Down
7 changes: 3 additions & 4 deletions trunk/drivers/media/video/c-qcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,7 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le
* Video4linux interfacing
*/

static int qcam_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam=(struct qcam_device *)dev;
Expand Down Expand Up @@ -667,9 +666,9 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
}

static int qcam_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl);
return video_usercopy(file, cmd, arg, qcam_do_ioctl);
}

static ssize_t qcam_read(struct file *file, char __user *buf,
Expand Down
9 changes: 4 additions & 5 deletions trunk/drivers/media/video/cpia.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3333,8 +3333,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,
return cam->decompressed_frame.count;
}

static int cpia_do_ioctl(struct inode *inode, struct file *file,
unsigned int ioctlnr, void *arg)
static int cpia_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = file->private_data;
struct cam_data *cam = video_get_drvdata(dev);
Expand All @@ -3347,9 +3346,9 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
if (mutex_lock_interruptible(&cam->busy_lock))
return -EINTR;

//DBG("cpia_ioctl: %u\n", ioctlnr);
/* DBG("cpia_ioctl: %u\n", cmd); */

switch (ioctlnr) {
switch (cmd) {
/* query capabilities */
case VIDIOCGCAP:
{
Expand Down Expand Up @@ -3724,7 +3723,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
static int cpia_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, cpia_do_ioctl);
return video_usercopy(file, cmd, arg, cpia_do_ioctl);
}


Expand Down
13 changes: 6 additions & 7 deletions trunk/drivers/media/video/cpia2/cpia2_v4l.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1572,8 +1572,7 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)
* cpia2_ioctl
*
*****************************************************************************/
static int cpia2_do_ioctl(struct inode *inode, struct file *file,
unsigned int ioctl_nr, void *arg)
static int cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct camera_data *cam = video_drvdata(file);
int retval = 0;
Expand All @@ -1591,7 +1590,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
}

/* Priority check */
switch (ioctl_nr) {
switch (cmd) {
case VIDIOCSWIN:
case VIDIOCMCAPTURE:
case VIDIOC_S_FMT:
Expand All @@ -1618,7 +1617,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
break;
}

switch (ioctl_nr) {
switch (cmd) {
case VIDIOCGCAP: /* query capabilities */
retval = ioctl_cap_query(arg, cam);
break;
Expand Down Expand Up @@ -1683,7 +1682,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_ENUMINPUT:
case VIDIOC_G_INPUT:
case VIDIOC_S_INPUT:
retval = ioctl_input(ioctl_nr, arg,cam);
retval = ioctl_input(cmd, arg, cam);
break;

case VIDIOC_ENUM_FMT:
Expand Down Expand Up @@ -1843,9 +1842,9 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file,
}

static int cpia2_ioctl(struct inode *inode, struct file *file,
unsigned int ioctl_nr, unsigned long iarg)
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, ioctl_nr, iarg, cpia2_do_ioctl);
return video_usercopy(file, cmd, arg, cpia2_do_ioctl);
}

/******************************************************************************
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/ov511.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4011,8 +4011,7 @@ ov51x_v4l1_close(struct inode *inode, struct file *file)

/* Do not call this function directly! */
static int
ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
ov51x_v4l1_ioctl_internal(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *vdev = file->private_data;
struct usb_ov511 *ov = video_get_drvdata(vdev);
Expand Down Expand Up @@ -4461,7 +4460,7 @@ ov51x_v4l1_ioctl(struct inode *inode, struct file *file,
if (mutex_lock_interruptible(&ov->lock))
return -EINTR;

rc = video_usercopy(inode, file, cmd, arg, ov51x_v4l1_ioctl_internal);
rc = video_usercopy(file, cmd, arg, ov51x_v4l1_ioctl_internal);

mutex_unlock(&ov->lock);
return rc;
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/pms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,7 @@ static int pms_capture(struct pms_device *dev, char __user *buf, int rgb555, int
* Video4linux interfacing
*/

static int pms_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int pms_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
struct pms_device *pd=(struct pms_device *)dev;
Expand Down Expand Up @@ -866,7 +865,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
static int pms_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, pms_do_ioctl);
return video_usercopy(file, cmd, arg, pms_do_ioctl);
}

static ssize_t pms_read(struct file *file, char __user *buf,
Expand Down
13 changes: 3 additions & 10 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ static const char *get_v4l_name(int v4l_type)
* This is part of Video 4 Linux API. The procedure handles ioctl() calls.
*
*/
static int __pvr2_v4l2_do_ioctl(struct file *file,
unsigned int cmd, void *arg)
static int pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct pvr2_v4l2_fh *fh = file->private_data;
struct pvr2_v4l2 *vp = fh->vhead;
Expand Down Expand Up @@ -864,7 +863,7 @@ static int __pvr2_v4l2_do_ioctl(struct file *file,

default :
ret = v4l_compat_translate_ioctl(file, cmd,
arg, __pvr2_v4l2_do_ioctl);
arg, pvr2_v4l2_do_ioctl);
}

pvr2_hdw_commit_ctl(hdw);
Expand All @@ -890,12 +889,6 @@ static int __pvr2_v4l2_do_ioctl(struct file *file,
return ret;
}

static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
{
return __pvr2_v4l2_do_ioctl(file, cmd, arg);
}

static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
{
int num = dip->devbase.num;
Expand Down Expand Up @@ -963,7 +956,7 @@ static int pvr2_v4l2_ioctl(struct inode *inode, struct file *file,
#define IVTV_IOC_G_CODEC 0xFFEE7703
#define IVTV_IOC_S_CODEC 0xFFEE7704
if (cmd == IVTV_IOC_G_CODEC || cmd == IVTV_IOC_S_CODEC) return 0;
return video_usercopy(inode, file, cmd, arg, pvr2_v4l2_do_ioctl);
return video_usercopy(file, cmd, arg, pvr2_v4l2_do_ioctl);
}


Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file,

mutex_lock(&pdev->modlock);
if (!pdev->unplugged)
r = video_usercopy(inode, file, cmd, arg, pwc_video_do_ioctl);
r = video_usercopy(file, cmd, arg, pwc_video_do_ioctl);
mutex_unlock(&pdev->modlock);
out:
return r;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/media/video/pwc/pwc-v4l.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,7 @@ static int pwc_vidioc_set_fmt(struct pwc_device *pdev, struct v4l2_format *f)

}

int pwc_video_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
int pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *vdev = video_devdata(file);
struct pwc_device *pdev;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/media/video/pwc/pwc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,7 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power);
extern int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg);

/** Functions in pwc-v4l.c */
extern int pwc_video_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg);
extern int pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);

/** pwc-uncompress.c */
/* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/saa5246a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,8 +804,7 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t,
*
* Returns 0 if successful
*/
static int do_saa5246a_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int do_saa5246a_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct saa5246a_device *t = video_drvdata(file);

Expand Down Expand Up @@ -953,7 +952,7 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,

cmd = vtx_fix_command(cmd);
mutex_lock(&t->lock);
err = video_usercopy(inode, file, cmd, arg, do_saa5246a_ioctl);
err = video_usercopy(file, cmd, arg, do_saa5246a_ioctl);
mutex_unlock(&t->lock);
return err;
}
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/saa5249.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
* Standard character-device-driver functions
*/

static int do_saa5249_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int do_saa5249_ioctl(struct file *file, unsigned int cmd, void *arg)
{
static int virtual_mode = false;
struct saa5249_device *t = video_drvdata(file);
Expand Down Expand Up @@ -488,7 +487,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,

cmd = vtx_fix_command(cmd);
mutex_lock(&t->lock);
err = video_usercopy(inode,file,cmd,arg,do_saa5249_ioctl);
err = video_usercopy(file, cmd, arg, do_saa5249_ioctl);
mutex_unlock(&t->lock);
return err;
}
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/se401.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -975,8 +975,7 @@ static int se401_close(struct inode *inode, struct file *file)
return 0;
}

static int se401_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int se401_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *vdev = file->private_data;
struct usb_se401 *se401 = (struct usb_se401 *)vdev;
Expand Down Expand Up @@ -1142,7 +1141,7 @@ static int se401_do_ioctl(struct inode *inode, struct file *file,
static int se401_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, se401_do_ioctl);
return video_usercopy(file, cmd, arg, se401_do_ioctl);
}

static ssize_t se401_read(struct file *file, char __user *buf,
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/stv680.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,8 +1132,7 @@ static int stv_close (struct inode *inode, struct file *file)
return 0;
}

static int stv680_do_ioctl (struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int stv680_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *vdev = file->private_data;
struct usb_stv *stv680 = video_get_drvdata(vdev);
Expand Down Expand Up @@ -1303,7 +1302,7 @@ static int stv680_do_ioctl (struct inode *inode, struct file *file,
static int stv680_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, stv680_do_ioctl);
return video_usercopy(file, cmd, arg, stv680_do_ioctl);
}

static int stv680_mmap (struct file *file, struct vm_area_struct *vma)
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/media/video/usbvideo/usbvideo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,8 +1281,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
* History:
* 22-Jan-2000 Corrected VIDIOCSPICT to reject unsupported settings.
*/
static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static int usbvideo_v4l_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct uvd *uvd = file->private_data;

Expand Down Expand Up @@ -1505,7 +1504,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
static int usbvideo_v4l_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(inode, file, cmd, arg, usbvideo_v4l_do_ioctl);
return video_usercopy(file, cmd, arg, usbvideo_v4l_do_ioctl);
}

/*
Expand Down
Loading

0 comments on commit 85db8ba

Please sign in to comment.