aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-04 10:59:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 09:50:12 -0400
commit0e8025b9f6011a6bd69d01080d584bc95a89d02e (patch)
tree228712a97a37d887d1eca9c17f83ada102d53291 /drivers
parent85f5fe3962ca6780e5368feffe32f3b15e953e1f (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')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c4
-rw-r--r--drivers/media/pci/cx18/cx18-ioctl.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-video.c2
-rw-r--r--drivers/media/pci/ivtv/ivtv-ioctl.c2
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c4
-rw-r--r--drivers/media/pci/saa7146/mxb.c2
-rw-r--r--drivers/media/pci/ttpci/av7110_v4l.c2
-rw-r--r--drivers/media/radio/radio-miropcm20.c2
-rw-r--r--drivers/media/radio/radio-sf16fmi.c2
-rw-r--r--drivers/media/radio/radio-tea5764.c2
-rw-r--r--drivers/media/radio/radio-timb.c2
-rw-r--r--drivers/media/radio/radio-wl1273.c2
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.c2
-rw-r--r--drivers/media/usb/au0828/au0828-video.c2
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-video.c4
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c4
-rw-r--r--drivers/media/usb/hdpvr/hdpvr-video.c2
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-v4l2.c2
-rw-r--r--drivers/media/usb/tlg2300/pd-radio.c2
-rw-r--r--drivers/media/usb/tlg2300/pd-video.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-video.c2
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c2
22 files changed, 26 insertions, 26 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
3079static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 3079static 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
3482static int radio_s_audio(struct file *file, void *priv, 3482static 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
495static int cx18_s_audio(struct file *file, void *fh, struct v4l2_audio *vout) 495static 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
1428static int vidioc_s_audinput(struct file *file, void *priv, 1428static 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
787static int ivtv_s_audio(struct file *file, void *fh, struct v4l2_audio *vout) 787static 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
2092static int saa7134_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 2092static 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
2375static int radio_s_audio(struct file *file, void *priv, 2375static 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
649static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a) 649static 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
529static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a) 529static 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;
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index 87c1ee13b058..11f76ed4c6fb 100644
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -197,7 +197,7 @@ static int vidioc_g_audio(struct file *file, void *priv,
197} 197}
198 198
199static int vidioc_s_audio(struct file *file, void *priv, 199static int vidioc_s_audio(struct file *file, void *priv,
200 struct v4l2_audio *a) 200 const struct v4l2_audio *a)
201{ 201{
202 return a->index ? -EINVAL : 0; 202 return a->index ? -EINVAL : 0;
203} 203}
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 8185d5fbfa89..227dcdb54df3 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -239,7 +239,7 @@ static int vidioc_g_audio(struct file *file, void *priv,
239} 239}
240 240
241static int vidioc_s_audio(struct file *file, void *priv, 241static int vidioc_s_audio(struct file *file, void *priv,
242 struct v4l2_audio *a) 242 const struct v4l2_audio *a)
243{ 243{
244 return a->index ? -EINVAL : 0; 244 return a->index ? -EINVAL : 0;
245} 245}
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 6b1fae32b483..efb05aa81d08 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -448,7 +448,7 @@ static int vidioc_g_audio(struct file *file, void *priv,
448} 448}
449 449
450static int vidioc_s_audio(struct file *file, void *priv, 450static int vidioc_s_audio(struct file *file, void *priv,
451 struct v4l2_audio *a) 451 const struct v4l2_audio *a)
452{ 452{
453 if (a->index != 0) 453 if (a->index != 0)
454 return -EINVAL; 454 return -EINVAL;
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index 09fc56052d35..5cf07779f4bb 100644
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -85,7 +85,7 @@ static int timbradio_vidioc_g_audio(struct file *file, void *priv,
85} 85}
86 86
87static int timbradio_vidioc_s_audio(struct file *file, void *priv, 87static int timbradio_vidioc_s_audio(struct file *file, void *priv,
88 struct v4l2_audio *a) 88 const struct v4l2_audio *a)
89{ 89{
90 return a->index ? -EINVAL : 0; 90 return a->index ? -EINVAL : 0;
91} 91}
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 71968a610734..2d93354fdcec 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1479,7 +1479,7 @@ static int wl1273_fm_vidioc_g_audio(struct file *file, void *priv,
1479} 1479}
1480 1480
1481static int wl1273_fm_vidioc_s_audio(struct file *file, void *priv, 1481static int wl1273_fm_vidioc_s_audio(struct file *file, void *priv,
1482 struct v4l2_audio *audio) 1482 const struct v4l2_audio *audio)
1483{ 1483{
1484 struct wl1273_device *radio = video_get_drvdata(video_devdata(file)); 1484 struct wl1273_device *radio = video_get_drvdata(video_devdata(file));
1485 1485
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index f816ea68e469..09585a99f02c 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -258,7 +258,7 @@ static int fm_v4l2_vidioc_g_audio(struct file *file, void *priv,
258} 258}
259 259
260static int fm_v4l2_vidioc_s_audio(struct file *file, void *priv, 260static int fm_v4l2_vidioc_s_audio(struct file *file, void *priv,
261 struct v4l2_audio *audio) 261 const struct v4l2_audio *audio)
262{ 262{
263 if (audio->index != 0) 263 if (audio->index != 0)
264 return -EINVAL; 264 return -EINVAL;
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index fa0fa9ae91c7..870585570571 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -1465,7 +1465,7 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
1465 return 0; 1465 return 0;
1466} 1466}
1467 1467
1468static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 1468static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *a)
1469{ 1469{
1470 struct au0828_fh *fh = priv; 1470 struct au0828_fh *fh = priv;
1471 struct au0828_dev *dev = fh->dev; 1471 struct au0828_dev *dev = fh->dev;
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 790b28d7f764..fedf7852a355 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1253,7 +1253,7 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
1253 return 0; 1253 return 0;
1254} 1254}
1255 1255
1256static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 1256static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *a)
1257{ 1257{
1258 struct cx231xx_fh *fh = priv; 1258 struct cx231xx_fh *fh = priv;
1259 struct cx231xx *dev = fh->dev; 1259 struct cx231xx *dev = fh->dev;
@@ -2096,7 +2096,7 @@ static int radio_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
2096 return 0; 2096 return 0;
2097} 2097}
2098 2098
2099static int radio_s_audio(struct file *file, void *fh, struct v4l2_audio *a) 2099static int radio_s_audio(struct file *file, void *fh, const struct v4l2_audio *a)
2100{ 2100{
2101 return 0; 2101 return 0;
2102} 2102}
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 78d6ebd712b9..1e553d357380 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1352,7 +1352,7 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
1352 return 0; 1352 return 0;
1353} 1353}
1354 1354
1355static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 1355static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *a)
1356{ 1356{
1357 struct em28xx_fh *fh = priv; 1357 struct em28xx_fh *fh = priv;
1358 struct em28xx *dev = fh->dev; 1358 struct em28xx *dev = fh->dev;
@@ -2087,7 +2087,7 @@ static int radio_s_tuner(struct file *file, void *priv,
2087} 2087}
2088 2088
2089static int radio_s_audio(struct file *file, void *fh, 2089static int radio_s_audio(struct file *file, void *fh,
2090 struct v4l2_audio *a) 2090 const struct v4l2_audio *a)
2091{ 2091{
2092 return 0; 2092 return 0;
2093} 2093}
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 0e9e156bb2aa..da6b77912222 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -677,7 +677,7 @@ static int vidioc_enumaudio(struct file *file, void *priv,
677} 677}
678 678
679static int vidioc_s_audio(struct file *file, void *private_data, 679static int vidioc_s_audio(struct file *file, void *private_data,
680 struct v4l2_audio *audio) 680 const struct v4l2_audio *audio)
681{ 681{
682 struct hdpvr_fh *fh = file->private_data; 682 struct hdpvr_fh *fh = file->private_data;
683 struct hdpvr_device *dev = fh->dev; 683 struct hdpvr_device *dev = fh->dev;
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index f344aed32a93..7a445b0e725e 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -333,7 +333,7 @@ static int pvr2_g_audio(struct file *file, void *priv, struct v4l2_audio *vin)
333 return 0; 333 return 0;
334} 334}
335 335
336static int pvr2_s_audio(struct file *file, void *priv, struct v4l2_audio *vout) 336static int pvr2_s_audio(struct file *file, void *priv, const struct v4l2_audio *vout)
337{ 337{
338 if (vout->index) 338 if (vout->index)
339 return -EINVAL; 339 return -EINVAL;
diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
index 4fad1dfb92cf..25eeb166aa0b 100644
--- a/drivers/media/usb/tlg2300/pd-radio.c
+++ b/drivers/media/usb/tlg2300/pd-radio.c
@@ -348,7 +348,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
348{ 348{
349 return vt->index > 0 ? -EINVAL : 0; 349 return vt->index > 0 ? -EINVAL : 0;
350} 350}
351static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *va) 351static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *va)
352{ 352{
353 return (va->index != 0) ? -EINVAL : 0; 353 return (va->index != 0) ? -EINVAL : 0;
354} 354}
diff --git a/drivers/media/usb/tlg2300/pd-video.c b/drivers/media/usb/tlg2300/pd-video.c
index bfbf9e56b0a4..1f448ac7a496 100644
--- a/drivers/media/usb/tlg2300/pd-video.c
+++ b/drivers/media/usb/tlg2300/pd-video.c
@@ -1029,7 +1029,7 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a)
1029 return 0; 1029 return 0;
1030} 1030}
1031 1031
1032static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a) 1032static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *a)
1033{ 1033{
1034 return (0 == a->index) ? 0 : -EINVAL; 1034 return (0 == a->index) ? 0 : -EINVAL;
1035} 1035}
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index 45ed59cb2d04..4342cd4f5c8a 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -1401,7 +1401,7 @@ static int radio_g_audio(struct file *file, void *priv,
1401} 1401}
1402 1402
1403static int radio_s_audio(struct file *file, void *priv, 1403static int radio_s_audio(struct file *file, void *priv,
1404 struct v4l2_audio *a) 1404 const struct v4l2_audio *a)
1405{ 1405{
1406 return 0; 1406 return 0;
1407} 1407}
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 8a4317979a43..f67018ed3795 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -684,7 +684,7 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
684} 684}
685 685
686static int vidioc_s_audio(struct file *file, void *fh, 686static int vidioc_s_audio(struct file *file, void *fh,
687 struct v4l2_audio *a) 687 const struct v4l2_audio *a)
688{ 688{
689 if (a->index) 689 if (a->index)
690 return -EINVAL; 690 return -EINVAL;