aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c8
-rw-r--r--drivers/media/pci/cx18/cx18-ioctl.c8
-rw-r--r--drivers/media/pci/cx88/cx88-video.c4
-rw-r--r--drivers/media/pci/ivtv/ivtv-ioctl.c8
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c4
-rw-r--r--drivers/media/pci/saa7146/mxb.c8
-rw-r--r--drivers/media/pci/tw68/tw68-video.c4
-rw-r--r--drivers/media/platform/marvell-ccic/mcam-core.c8
-rw-r--r--drivers/media/radio/radio-si476x.c4
-rw-r--r--drivers/media/usb/au0828/au0828-video.c4
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-video.c10
-rw-r--r--drivers/media/usb/cx231xx/cx231xx.h6
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c6
-rw-r--r--drivers/media/usb/gspca/gspca.c6
-rw-r--r--drivers/media/usb/stk1160/stk1160-v4l.c4
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c4
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c12
-rw-r--r--include/media/v4l2-ioctl.h6
18 files changed, 57 insertions, 57 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 4ec2a3c3f23c..20dcd28de390 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1908,10 +1908,10 @@ static int bttv_log_status(struct file *file, void *f)
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int bttv_g_register(struct file *file, void *f,
+static int bttv_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
- struct bttv_fh *fh = f;
+ struct bttv_fh *fh = file->private_data;
struct bttv *btv = fh->btv;
/* bt848 has a 12-bit register space */
@@ -1922,10 +1922,10 @@ static int bttv_g_register(struct file *file, void *f,
return 0;
}
-static int bttv_s_register(struct file *file, void *f,
+static int bttv_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
- struct bttv_fh *fh = f;
+ struct bttv_fh *fh = file->private_data;
struct bttv *btv = fh->btv;
/* bt848 has a 12-bit register space */
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 8b410bfaafe9..5730c1afb9f3 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -364,10 +364,10 @@ static int cx18_s_fmt_sliced_vbi_cap(struct file *file, void *fh,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int cx18_g_register(struct file *file, void *fh,
+static int cx18_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
- struct cx18 *cx = fh2id(fh)->cx;
+ struct cx18 *cx = fh2id(file->private_data)->cx;
if (reg->reg & 0x3)
return -EINVAL;
@@ -378,10 +378,10 @@ static int cx18_g_register(struct file *file, void *fh,
return 0;
}
-static int cx18_s_register(struct file *file, void *fh,
+static int cx18_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
- struct cx18 *cx = fh2id(fh)->cx;
+ struct cx18 *cx = fh2id(file->private_data)->cx;
if (reg->reg & 0x3)
return -EINVAL;
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 860c98fc72c7..e5a9941cf0e9 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1015,7 +1015,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register (struct file *file, void *fh,
+static int vidioc_g_register (struct file *file,
struct v4l2_dbg_register *reg)
{
struct cx8800_dev *dev = video_drvdata(file);
@@ -1027,7 +1027,7 @@ static int vidioc_g_register (struct file *file, void *fh,
return 0;
}
-static int vidioc_s_register (struct file *file, void *fh,
+static int vidioc_s_register (struct file *file,
const struct v4l2_dbg_register *reg)
{
struct cx8800_dev *dev = video_drvdata(file);
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 682911117425..03467b71d32d 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -713,17 +713,17 @@ static int ivtv_itvc(struct ivtv *itv, bool get, u64 reg, u64 *val)
return 0;
}
-static int ivtv_g_register(struct file *file, void *fh, struct v4l2_dbg_register *reg)
+static int ivtv_g_register(struct file *file, struct v4l2_dbg_register *reg)
{
- struct ivtv *itv = fh2id(fh)->itv;
+ struct ivtv *itv = fh2id(file->private_data)->itv;
reg->size = 4;
return ivtv_itvc(itv, true, reg->reg, &reg->val);
}
-static int ivtv_s_register(struct file *file, void *fh, const struct v4l2_dbg_register *reg)
+static int ivtv_s_register(struct file *file, const struct v4l2_dbg_register *reg)
{
- struct ivtv *itv = fh2id(fh)->itv;
+ struct ivtv *itv = fh2id(file->private_data)->itv;
u64 val = reg->val;
return ivtv_itvc(itv, false, reg->reg, &val);
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 99d09a7566d3..c245b00f0555 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1818,7 +1818,7 @@ static int saa7134_overlay(struct file *file, void *priv, unsigned int on)
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register (struct file *file, void *priv,
+static int vidioc_g_register (struct file *file,
struct v4l2_dbg_register *reg)
{
struct saa7134_dev *dev = video_drvdata(file);
@@ -1828,7 +1828,7 @@ static int vidioc_g_register (struct file *file, void *priv,
return 0;
}
-static int vidioc_s_register (struct file *file, void *priv,
+static int vidioc_s_register (struct file *file,
const struct v4l2_dbg_register *reg)
{
struct saa7134_dev *dev = video_drvdata(file);
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c
index c4c8fce8f2b4..4854604acf3c 100644
--- a/drivers/media/pci/saa7146/mxb.c
+++ b/drivers/media/pci/saa7146/mxb.c
@@ -665,9 +665,9 @@ static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register(struct file *file, void *fh, struct v4l2_dbg_register *reg)
+static int vidioc_g_register(struct file *file, struct v4l2_dbg_register *reg)
{
- struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
+ struct saa7146_dev *dev = ((struct saa7146_fh *)file->private_data)->dev;
if (reg->reg > pci_resource_len(dev->pci, 0) - 4)
return -EINVAL;
@@ -676,9 +676,9 @@ static int vidioc_g_register(struct file *file, void *fh, struct v4l2_dbg_regist
return 0;
}
-static int vidioc_s_register(struct file *file, void *fh, const struct v4l2_dbg_register *reg)
+static int vidioc_s_register(struct file *file, const struct v4l2_dbg_register *reg)
{
- struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
+ struct saa7146_dev *dev = ((struct saa7146_fh *)file->private_data)->dev;
if (reg->reg > pci_resource_len(dev->pci, 0) - 4)
return -EINVAL;
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 8355e55b4e8e..31b40af506bd 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -849,7 +849,7 @@ static int vidioc_log_status(struct file *file, void *priv)
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct tw68_dev *dev = video_drvdata(file);
@@ -861,7 +861,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return 0;
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct tw68_dev *dev = video_drvdata(file);
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index e5dc96d3c410..6b638dc817ed 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1589,10 +1589,10 @@ static int mcam_vidioc_enum_frameintervals(struct file *filp,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int mcam_vidioc_g_register(struct file *file, void *priv,
+static int mcam_vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
- struct mcam_camera *cam = priv;
+ struct mcam_camera *cam = file->private_data;
if (reg->reg > cam->regs_size - 4)
return -EINVAL;
@@ -1601,10 +1601,10 @@ static int mcam_vidioc_g_register(struct file *file, void *priv,
return 0;
}
-static int mcam_vidioc_s_register(struct file *file, void *priv,
+static int mcam_vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
- struct mcam_camera *cam = priv;
+ struct mcam_camera *cam = file->private_data;
if (reg->reg > cam->regs_size - 4)
return -EINVAL;
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index dccf58691650..3388f1882f36 100644
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1019,7 +1019,7 @@ static int si476x_radio_s_ctrl(struct v4l2_ctrl *ctrl)
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int si476x_radio_g_register(struct file *file, void *fh,
+static int si476x_radio_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
int err;
@@ -1035,7 +1035,7 @@ static int si476x_radio_g_register(struct file *file, void *fh,
return err;
}
-static int si476x_radio_s_register(struct file *file, void *fh,
+static int si476x_radio_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index bf990a931d4e..89dedbf056b8 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -1537,7 +1537,7 @@ static int vidioc_cropcap(struct file *file, void *priv,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct au0828_dev *dev = video_drvdata(file);
@@ -1550,7 +1550,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return 0;
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct au0828_dev *dev = video_drvdata(file);
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index acc1b68c408e..75ebf0f17e72 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1301,7 +1301,7 @@ int cx231xx_s_frequency(struct file *file, void *priv,
#ifdef CONFIG_VIDEO_ADV_DEBUG
-int cx231xx_g_chip_info(struct file *file, void *fh,
+int cx231xx_g_chip_info(struct file *file,
struct v4l2_dbg_chip_info *chip)
{
switch (chip->match.addr) {
@@ -1329,10 +1329,10 @@ int cx231xx_g_chip_info(struct file *file, void *fh,
return -EINVAL;
}
-int cx231xx_g_register(struct file *file, void *priv,
+int cx231xx_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
- struct cx231xx_fh *fh = priv;
+ struct cx231xx_fh *fh = file->private_data;
struct cx231xx *dev = fh->dev;
int ret;
u8 value[4] = { 0, 0, 0, 0 };
@@ -1388,10 +1388,10 @@ int cx231xx_g_register(struct file *file, void *priv,
return ret < 0 ? ret : 0;
}
-int cx231xx_s_register(struct file *file, void *priv,
+int cx231xx_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
- struct cx231xx_fh *fh = priv;
+ struct cx231xx_fh *fh = file->private_data;
struct cx231xx *dev = fh->dev;
int ret;
u8 data[4] = { 0, 0, 0, 0 };
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 573b3c036a65..6f85c41187c3 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -954,10 +954,10 @@ int cx231xx_enum_input(struct file *file, void *priv,
struct v4l2_input *i);
int cx231xx_g_input(struct file *file, void *priv, unsigned int *i);
int cx231xx_s_input(struct file *file, void *priv, unsigned int i);
-int cx231xx_g_chip_info(struct file *file, void *fh, struct v4l2_dbg_chip_info *chip);
-int cx231xx_g_register(struct file *file, void *priv,
+int cx231xx_g_chip_info(struct file *file, struct v4l2_dbg_chip_info *chip);
+int cx231xx_g_register(struct file *file,
struct v4l2_dbg_register *reg);
-int cx231xx_s_register(struct file *file, void *priv,
+int cx231xx_s_register(struct file *file,
const struct v4l2_dbg_register *reg);
/* Provided by cx231xx-cards.c */
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 0b46c4a86a93..8f79ed157eeb 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1616,7 +1616,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_chip_info(struct file *file, void *priv,
+static int vidioc_g_chip_info(struct file *file,
struct v4l2_dbg_chip_info *chip)
{
struct em28xx *dev = video_drvdata(file);
@@ -1643,7 +1643,7 @@ static int em28xx_reg_len(int reg)
}
}
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct em28xx *dev = video_drvdata(file);
@@ -1684,7 +1684,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return 0;
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct em28xx *dev = video_drvdata(file);
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index 3c8051b97799..52f6759fc4e5 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -1030,7 +1030,7 @@ static int gspca_get_mode(struct gspca_dev *gspca_dev,
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_chip_info(struct file *file, void *priv,
+static int vidioc_g_chip_info(struct file *file,
struct v4l2_dbg_chip_info *chip)
{
struct gspca_dev *gspca_dev = video_drvdata(file);
@@ -1041,7 +1041,7 @@ static int vidioc_g_chip_info(struct file *file, void *priv,
return chip->match.addr ? -EINVAL : 0;
}
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct gspca_dev *gspca_dev = video_drvdata(file);
@@ -1050,7 +1050,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return gspca_dev->sd_desc->get_register(gspca_dev, reg);
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct gspca_dev *gspca_dev = video_drvdata(file);
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index 65a326c5128f..34b16104a810 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -450,7 +450,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
}
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct stk1160 *dev = video_drvdata(file);
@@ -465,7 +465,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return rc;
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct stk1160 *dev = video_drvdata(file);
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index cd2fbf11e3b4..0a3a5c4971bd 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -462,7 +462,7 @@ static int usbvision_v4l2_close(struct file *file)
*
*/
#ifdef CONFIG_VIDEO_ADV_DEBUG
-static int vidioc_g_register(struct file *file, void *priv,
+static int vidioc_g_register(struct file *file,
struct v4l2_dbg_register *reg)
{
struct usb_usbvision *usbvision = video_drvdata(file);
@@ -481,7 +481,7 @@ static int vidioc_g_register(struct file *file, void *priv,
return 0;
}
-static int vidioc_s_register(struct file *file, void *priv,
+static int vidioc_s_register(struct file *file,
const struct v4l2_dbg_register *reg)
{
struct usb_usbvision *usbvision = video_drvdata(file);
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index da5930e1ba16..1c24e1006221 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1945,7 +1945,7 @@ static int v4l_log_status(const struct v4l2_ioctl_ops *ops,
}
static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+ struct file *file, void *arg)
{
#ifdef CONFIG_VIDEO_ADV_DEBUG
struct v4l2_dbg_register *p = arg;
@@ -1965,7 +1965,7 @@ static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,
}
if (ops->vidioc_g_register && p->match.type == V4L2_CHIP_MATCH_BRIDGE &&
(ops->vidioc_g_chip_info || p->match.addr == 0))
- return ops->vidioc_g_register(file, fh, p);
+ return ops->vidioc_g_register(file, p);
return -EINVAL;
#else
return -ENOTTY;
@@ -1973,7 +1973,7 @@ static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,
}
static int v4l_dbg_s_register(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+ struct file *file, void *arg)
{
#ifdef CONFIG_VIDEO_ADV_DEBUG
const struct v4l2_dbg_register *p = arg;
@@ -1993,7 +1993,7 @@ static int v4l_dbg_s_register(const struct v4l2_ioctl_ops *ops,
}
if (ops->vidioc_s_register && p->match.type == V4L2_CHIP_MATCH_BRIDGE &&
(ops->vidioc_g_chip_info || p->match.addr == 0))
- return ops->vidioc_s_register(file, fh, p);
+ return ops->vidioc_s_register(file, p);
return -EINVAL;
#else
return -ENOTTY;
@@ -2001,7 +2001,7 @@ static int v4l_dbg_s_register(const struct v4l2_ioctl_ops *ops,
}
static int v4l_dbg_g_chip_info(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+ struct file *file, void *arg)
{
#ifdef CONFIG_VIDEO_ADV_DEBUG
struct video_device *vfd = video_devdata(file);
@@ -2017,7 +2017,7 @@ static int v4l_dbg_g_chip_info(const struct v4l2_ioctl_ops *ops,
p->flags |= V4L2_CHIP_FL_READABLE;
strlcpy(p->name, vfd->v4l2_dev->name, sizeof(p->name));
if (ops->vidioc_g_chip_info)
- return ops->vidioc_g_chip_info(file, fh, arg);
+ return ops->vidioc_g_chip_info(file, arg);
if (p->match.addr)
return -EINVAL;
return 0;
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 95261e6601d1..ae2e3ed5b839 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -243,12 +243,12 @@ struct v4l2_ioctl_ops {
/* Debugging ioctls */
#ifdef CONFIG_VIDEO_ADV_DEBUG
- int (*vidioc_g_register) (struct file *file, void *fh,
+ int (*vidioc_g_register) (struct file *file,
struct v4l2_dbg_register *reg);
- int (*vidioc_s_register) (struct file *file, void *fh,
+ int (*vidioc_s_register) (struct file *file,
const struct v4l2_dbg_register *reg);
- int (*vidioc_g_chip_info) (struct file *file, void *fh,
+ int (*vidioc_g_chip_info) (struct file *file,
struct v4l2_dbg_chip_info *chip);
#endif

Privacy Policy