提交 ea48c13a 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

V4L/DVB (6861): cx2341x: command argument should be u32 instead of int

Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 f19a73d6
...@@ -775,7 +775,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p) ...@@ -775,7 +775,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)
EXPORT_SYMBOL(cx2341x_fill_defaults); EXPORT_SYMBOL(cx2341x_fill_defaults);
static int cx2341x_api(void *priv, cx2341x_mbox_func func, static int cx2341x_api(void *priv, cx2341x_mbox_func func,
int cmd, int args, ...) u32 cmd, int args, ...)
{ {
u32 data[CX2341X_MBOX_MAX_DATA]; u32 data[CX2341X_MBOX_MAX_DATA];
va_list vargs; va_list vargs;
......
...@@ -307,7 +307,7 @@ static int register_read(struct cx88_core *core, u32 address, u32 *value) ...@@ -307,7 +307,7 @@ static int register_read(struct cx88_core *core, u32 address, u32 *value)
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
static int blackbird_mbox_func(void *priv, int command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])
{ {
struct cx8802_dev *dev = priv; struct cx8802_dev *dev = priv;
unsigned long timeout; unsigned long timeout;
......
...@@ -333,7 +333,7 @@ int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]) ...@@ -333,7 +333,7 @@ int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[])
return (res == -EBUSY) ? ivtv_api_call(itv, cmd, args, data) : res; return (res == -EBUSY) ? ivtv_api_call(itv, cmd, args, data) : res;
} }
int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]) int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])
{ {
return ivtv_api(priv, cmd, in, data); return ivtv_api(priv, cmd, in, data);
} }
......
...@@ -28,6 +28,6 @@ void ivtv_api_get_data(struct ivtv_mailbox_data *mbox, int mb, u32 data[]); ...@@ -28,6 +28,6 @@ void ivtv_api_get_data(struct ivtv_mailbox_data *mbox, int mb, u32 data[]);
int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]); int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]);
int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...); int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...);
int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...); int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...);
int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]); int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]);
#endif #endif
...@@ -140,7 +140,7 @@ static int pvr2_encoder_read_words(struct pvr2_hdw *hdw, ...@@ -140,7 +140,7 @@ static int pvr2_encoder_read_words(struct pvr2_hdw *hdw,
cx2341x.ko to write to our encoder (by handing it a pointer to this cx2341x.ko to write to our encoder (by handing it a pointer to this
function). For earlier kernels this doesn't really matter. */ function). For earlier kernels this doesn't really matter. */
static int pvr2_encoder_cmd(void *ctxt, static int pvr2_encoder_cmd(void *ctxt,
int cmd, u32 cmd,
int arg_cnt_send, int arg_cnt_send,
int arg_cnt_recv, int arg_cnt_recv,
u32 *argp) u32 *argp)
......
...@@ -83,7 +83,7 @@ struct cx2341x_mpeg_params { ...@@ -83,7 +83,7 @@ struct cx2341x_mpeg_params {
#define CX2341X_MBOX_MAX_DATA 16 #define CX2341X_MBOX_MAX_DATA 16
extern const u32 cx2341x_mpeg_ctrls[]; extern const u32 cx2341x_mpeg_ctrls[];
typedef int (*cx2341x_mbox_func)(void *priv, int cmd, int in, int out, typedef int (*cx2341x_mbox_func)(void *priv, u32 cmd, int in, int out,
u32 data[CX2341X_MBOX_MAX_DATA]); u32 data[CX2341X_MBOX_MAX_DATA]);
int cx2341x_update(void *priv, cx2341x_mbox_func func, int cx2341x_update(void *priv, cx2341x_mbox_func func,
const struct cx2341x_mpeg_params *old, const struct cx2341x_mpeg_params *old,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册