diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-04 10:59:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 09:50:12 -0400 |
commit | 0e8025b9f6011a6bd69d01080d584bc95a89d02e (patch) | |
tree | 228712a97a37d887d1eca9c17f83ada102d53291 /drivers/media/pci | |
parent | 85f5fe3962ca6780e5368feffe32f3b15e953e1f (diff) |
[media] v4l2: make vidioc_s_audio const
Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_s_audio.
Adding const for write-only ioctls was decided during the 2012 Media Workshop.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 4 | ||||
-rw-r--r-- | drivers/media/pci/cx18/cx18-ioctl.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-video.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/ivtv/ivtv-ioctl.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/saa7134/saa7134-video.c | 4 | ||||
-rw-r--r-- | drivers/media/pci/saa7146/mxb.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_v4l.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 26bf309c41c2..31b282667463 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c | |||
@@ -3076,7 +3076,7 @@ static int bttv_g_audio(struct file *file, void *priv, struct v4l2_audio *a) | |||
3076 | return 0; | 3076 | return 0; |
3077 | } | 3077 | } |
3078 | 3078 | ||
3079 | static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a) | 3079 | static int bttv_s_audio(struct file *file, void *priv, const struct v4l2_audio *a) |
3080 | { | 3080 | { |
3081 | if (unlikely(a->index)) | 3081 | if (unlikely(a->index)) |
3082 | return -EINVAL; | 3082 | return -EINVAL; |
@@ -3480,7 +3480,7 @@ static int radio_s_tuner(struct file *file, void *priv, | |||
3480 | } | 3480 | } |
3481 | 3481 | ||
3482 | static int radio_s_audio(struct file *file, void *priv, | 3482 | static int radio_s_audio(struct file *file, void *priv, |
3483 | struct v4l2_audio *a) | 3483 | const struct v4l2_audio *a) |
3484 | { | 3484 | { |
3485 | if (unlikely(a->index)) | 3485 | if (unlikely(a->index)) |
3486 | return -EINVAL; | 3486 | return -EINVAL; |
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c index e9912db3b496..ff315446d4ad 100644 --- a/drivers/media/pci/cx18/cx18-ioctl.c +++ b/drivers/media/pci/cx18/cx18-ioctl.c | |||
@@ -492,7 +492,7 @@ static int cx18_g_audio(struct file *file, void *fh, struct v4l2_audio *vin) | |||
492 | return cx18_get_audio_input(cx, vin->index, vin); | 492 | return cx18_get_audio_input(cx, vin->index, vin); |
493 | } | 493 | } |
494 | 494 | ||
495 | static int cx18_s_audio(struct file *file, void *fh, struct v4l2_audio *vout) | 495 | static int cx18_s_audio(struct file *file, void *fh, const struct v4l2_audio *vout) |
496 | { | 496 | { |
497 | struct cx18 *cx = fh2id(fh)->cx; | 497 | struct cx18 *cx = fh2id(fh)->cx; |
498 | 498 | ||
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 22f8e7fbd665..8c4a9a5f9a50 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
@@ -1426,7 +1426,7 @@ static int vidioc_g_audinput(struct file *file, void *priv, | |||
1426 | } | 1426 | } |
1427 | 1427 | ||
1428 | static int vidioc_s_audinput(struct file *file, void *priv, | 1428 | static int vidioc_s_audinput(struct file *file, void *priv, |
1429 | struct v4l2_audio *i) | 1429 | const struct v4l2_audio *i) |
1430 | { | 1430 | { |
1431 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1431 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
1432 | if (i->index >= 2) | 1432 | if (i->index >= 2) |
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c index 966abb407304..99e35dd3d83e 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c | |||
@@ -784,7 +784,7 @@ static int ivtv_g_audio(struct file *file, void *fh, struct v4l2_audio *vin) | |||
784 | return ivtv_get_audio_input(itv, vin->index, vin); | 784 | return ivtv_get_audio_input(itv, vin->index, vin); |
785 | } | 785 | } |
786 | 786 | ||
787 | static int ivtv_s_audio(struct file *file, void *fh, struct v4l2_audio *vout) | 787 | static int ivtv_s_audio(struct file *file, void *fh, const struct v4l2_audio *vout) |
788 | { | 788 | { |
789 | struct ivtv *itv = fh2id(fh)->itv; | 789 | struct ivtv *itv = fh2id(fh)->itv; |
790 | 790 | ||
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index bac4386c64b9..135bfd8c28ad 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c | |||
@@ -2089,7 +2089,7 @@ static int saa7134_g_audio(struct file *file, void *priv, struct v4l2_audio *a) | |||
2089 | return 0; | 2089 | return 0; |
2090 | } | 2090 | } |
2091 | 2091 | ||
2092 | static int saa7134_s_audio(struct file *file, void *priv, struct v4l2_audio *a) | 2092 | static int saa7134_s_audio(struct file *file, void *priv, const struct v4l2_audio *a) |
2093 | { | 2093 | { |
2094 | return 0; | 2094 | return 0; |
2095 | } | 2095 | } |
@@ -2373,7 +2373,7 @@ static int radio_g_audio(struct file *file, void *priv, | |||
2373 | } | 2373 | } |
2374 | 2374 | ||
2375 | static int radio_s_audio(struct file *file, void *priv, | 2375 | static int radio_s_audio(struct file *file, void *priv, |
2376 | struct v4l2_audio *a) | 2376 | const struct v4l2_audio *a) |
2377 | { | 2377 | { |
2378 | return 0; | 2378 | return 0; |
2379 | } | 2379 | } |
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c index b520a45cb3f3..91369daad722 100644 --- a/drivers/media/pci/saa7146/mxb.c +++ b/drivers/media/pci/saa7146/mxb.c | |||
@@ -646,7 +646,7 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a) | |||
646 | return 0; | 646 | return 0; |
647 | } | 647 | } |
648 | 648 | ||
649 | static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a) | 649 | static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *a) |
650 | { | 650 | { |
651 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; | 651 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; |
652 | struct mxb *mxb = (struct mxb *)dev->ext_priv; | 652 | struct mxb *mxb = (struct mxb *)dev->ext_priv; |
diff --git a/drivers/media/pci/ttpci/av7110_v4l.c b/drivers/media/pci/ttpci/av7110_v4l.c index 1b2d15140a1d..730e906ea912 100644 --- a/drivers/media/pci/ttpci/av7110_v4l.c +++ b/drivers/media/pci/ttpci/av7110_v4l.c | |||
@@ -526,7 +526,7 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a) | |||
526 | return 0; | 526 | return 0; |
527 | } | 527 | } |
528 | 528 | ||
529 | static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a) | 529 | static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *a) |
530 | { | 530 | { |
531 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; | 531 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; |
532 | struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; | 532 | struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; |