aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
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/media/usb
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/media/usb')
-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
9 files changed, 11 insertions, 11 deletions
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;