V4L/DVB (9503): v4l: remove inode argument from video_usercopy

The inode argument was never used. Removing it from video_usercopy
brings the function pointer type of video_usercopy in line with similar
v4l2 functions, thus simplifying several drivers.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index d9de2e8e00d..3c2d7eac119 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -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;
@@ -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:
@@ -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;
@@ -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:
@@ -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);
 }
 
 /******************************************************************************