aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-26 07:04:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-29 07:18:36 -0400
commit6d43be7789db0455a82a3ad4ff5f713cc588c1e2 (patch)
treeae39f4a0c557c7e8f776f8788182d9d9d2ad8e2c
parent2f9e96c39fb4cc0680ccf2ec155133249174780c (diff)
[media] ioctl numbers are unsigned int
ioctl's number is unsigned int. Fix it at vidioc_default. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/pci/cx18/cx18-ioctl.c2
-rw-r--r--drivers/media/pci/ivtv/ivtv-ioctl.c2
-rw-r--r--drivers/media/pci/meye/meye.c2
-rw-r--r--drivers/media/platform/davinci/vpfe_capture.c2
-rw-r--r--drivers/media/radio/radio-si4713.c2
-rw-r--r--drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c2
-rw-r--r--include/media/v4l2-ioctl.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 7dbd5a9451ed..aee7b6dacbfe 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -1110,7 +1110,7 @@ static int cx18_log_status(struct file *file, void *fh)
1110} 1110}
1111 1111
1112static long cx18_default(struct file *file, void *fh, bool valid_prio, 1112static long cx18_default(struct file *file, void *fh, bool valid_prio,
1113 int cmd, void *arg) 1113 unsigned int cmd, void *arg)
1114{ 1114{
1115 struct cx18 *cx = fh2id(fh)->cx; 1115 struct cx18 *cx = fh2id(fh)->cx;
1116 1116
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 50379b26768b..9cbbce0eaedc 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -1807,7 +1807,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
1807} 1807}
1808 1808
1809static long ivtv_default(struct file *file, void *fh, bool valid_prio, 1809static long ivtv_default(struct file *file, void *fh, bool valid_prio,
1810 int cmd, void *arg) 1810 unsigned int cmd, void *arg)
1811{ 1811{
1812 struct ivtv *itv = fh2id(fh)->itv; 1812 struct ivtv *itv = fh2id(fh)->itv;
1813 1813
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 7859c43479d7..2381b05432e6 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1410,7 +1410,7 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
1410} 1410}
1411 1411
1412static long vidioc_default(struct file *file, void *fh, bool valid_prio, 1412static long vidioc_default(struct file *file, void *fh, bool valid_prio,
1413 int cmd, void *arg) 1413 unsigned int cmd, void *arg)
1414{ 1414{
1415 switch (cmd) { 1415 switch (cmd) {
1416 case MEYEIOC_G_PARAMS: 1416 case MEYEIOC_G_PARAMS:
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 20db8a077990..8c50d3074866 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1686,7 +1686,7 @@ unlock_out:
1686 1686
1687 1687
1688static long vpfe_param_handler(struct file *file, void *priv, 1688static long vpfe_param_handler(struct file *file, void *priv,
1689 bool valid_prio, int cmd, void *param) 1689 bool valid_prio, unsigned int cmd, void *param)
1690{ 1690{
1691 struct vpfe_device *vpfe_dev = video_drvdata(file); 1691 struct vpfe_device *vpfe_dev = video_drvdata(file);
1692 int ret = 0; 1692 int ret = 0;
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c
index 2a2d21ed9133..38b3f1541c4e 100644
--- a/drivers/media/radio/radio-si4713.c
+++ b/drivers/media/radio/radio-si4713.c
@@ -222,7 +222,7 @@ static int radio_si4713_s_frequency(struct file *file, void *p,
222} 222}
223 223
224static long radio_si4713_default(struct file *file, void *p, 224static long radio_si4713_default(struct file *file, void *p,
225 bool valid_prio, int cmd, void *arg) 225 bool valid_prio, unsigned int cmd, void *arg)
226{ 226{
227 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, core, 227 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, core,
228 ioctl, cmd, arg); 228 ioctl, cmd, arg);
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index 39a8fb2802e4..6c7d20f8f67c 100644
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
@@ -1021,7 +1021,7 @@ static int solo_s_parm(struct file *file, void *priv,
1021} 1021}
1022 1022
1023static long solo_enc_default(struct file *file, void *fh, 1023static long solo_enc_default(struct file *file, void *fh,
1024 bool valid_prio, int cmd, void *arg) 1024 bool valid_prio, unsigned int cmd, void *arg)
1025{ 1025{
1026 struct solo_enc_dev *solo_enc = video_drvdata(file); 1026 struct solo_enc_dev *solo_enc = video_drvdata(file);
1027 struct solo_dev *solo_dev = solo_enc->solo_dev; 1027 struct solo_dev *solo_dev = solo_enc->solo_dev;
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 75a7dfc07dec..b273f0e81818 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -275,7 +275,7 @@ struct v4l2_ioctl_ops {
275 275
276 /* For other private ioctls */ 276 /* For other private ioctls */
277 long (*vidioc_default) (struct file *file, void *fh, 277 long (*vidioc_default) (struct file *file, void *fh,
278 bool valid_prio, int cmd, void *arg); 278 bool valid_prio, unsigned int cmd, void *arg);
279}; 279};
280 280
281 281