diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-12-12 05:04:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:04 -0500 |
commit | ea48c13ad0e5626b827bd7076c22df1a352e3983 (patch) | |
tree | 152c5f10a0abd3f87ac1d0017ac397fbbc45ccae /drivers/media/video | |
parent | f19a73d620c5412e2413b778f4dad21febdd6115 (diff) |
V4L/DVB (6861): cx2341x: command argument should be u32 instead of int
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx2341x.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-mailbox.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-mailbox.h | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-encoder.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c index 890c8867af1c..c592899a2317 100644 --- a/drivers/media/video/cx2341x.c +++ b/drivers/media/video/cx2341x.c | |||
@@ -775,7 +775,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p) | |||
775 | EXPORT_SYMBOL(cx2341x_fill_defaults); | 775 | EXPORT_SYMBOL(cx2341x_fill_defaults); |
776 | 776 | ||
777 | static int cx2341x_api(void *priv, cx2341x_mbox_func func, | 777 | static int cx2341x_api(void *priv, cx2341x_mbox_func func, |
778 | int cmd, int args, ...) | 778 | u32 cmd, int args, ...) |
779 | { | 779 | { |
780 | u32 data[CX2341X_MBOX_MAX_DATA]; | 780 | u32 data[CX2341X_MBOX_MAX_DATA]; |
781 | va_list vargs; | 781 | va_list vargs; |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 5f79442924fd..a99e9d5950aa 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -307,7 +307,7 @@ static int register_read(struct cx88_core *core, u32 address, u32 *value) | |||
307 | 307 | ||
308 | /* ------------------------------------------------------------------ */ | 308 | /* ------------------------------------------------------------------ */ |
309 | 309 | ||
310 | static int blackbird_mbox_func(void *priv, int command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) | 310 | static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) |
311 | { | 311 | { |
312 | struct cx8802_dev *dev = priv; | 312 | struct cx8802_dev *dev = priv; |
313 | unsigned long timeout; | 313 | unsigned long timeout; |
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.c b/drivers/media/video/ivtv/ivtv-mailbox.c index b05436da7136..13a6c374d2db 100644 --- a/drivers/media/video/ivtv/ivtv-mailbox.c +++ b/drivers/media/video/ivtv/ivtv-mailbox.c | |||
@@ -333,7 +333,7 @@ int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]) | |||
333 | return (res == -EBUSY) ? ivtv_api_call(itv, cmd, args, data) : res; | 333 | return (res == -EBUSY) ? ivtv_api_call(itv, cmd, args, data) : res; |
334 | } | 334 | } |
335 | 335 | ||
336 | int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) | 336 | int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) |
337 | { | 337 | { |
338 | return ivtv_api(priv, cmd, in, data); | 338 | return ivtv_api(priv, cmd, in, data); |
339 | } | 339 | } |
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.h b/drivers/media/video/ivtv/ivtv-mailbox.h index 71a54eef8fc7..6ef12091e3f3 100644 --- a/drivers/media/video/ivtv/ivtv-mailbox.h +++ b/drivers/media/video/ivtv/ivtv-mailbox.h | |||
@@ -28,6 +28,6 @@ void ivtv_api_get_data(struct ivtv_mailbox_data *mbox, int mb, u32 data[]); | |||
28 | int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]); | 28 | int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]); |
29 | int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...); | 29 | int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...); |
30 | int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...); | 30 | int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...); |
31 | int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]); | 31 | int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]); |
32 | 32 | ||
33 | #endif | 33 | #endif |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c index 52b39954f990..64062879981e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c | |||
@@ -140,7 +140,7 @@ static int pvr2_encoder_read_words(struct pvr2_hdw *hdw, | |||
140 | cx2341x.ko to write to our encoder (by handing it a pointer to this | 140 | cx2341x.ko to write to our encoder (by handing it a pointer to this |
141 | function). For earlier kernels this doesn't really matter. */ | 141 | function). For earlier kernels this doesn't really matter. */ |
142 | static int pvr2_encoder_cmd(void *ctxt, | 142 | static int pvr2_encoder_cmd(void *ctxt, |
143 | int cmd, | 143 | u32 cmd, |
144 | int arg_cnt_send, | 144 | int arg_cnt_send, |
145 | int arg_cnt_recv, | 145 | int arg_cnt_recv, |
146 | u32 *argp) | 146 | u32 *argp) |