提交 877cb8a4 编写于 作者: T Tom Rix 提交者: Mauro Carvalho Chehab

media: tc358743: cleanup tc358743_cec_isr

tc358743_cec_isr is misnammed, it is not the main isr.
So rename it to be consistent with its siblings,
tc358743_cec_handler.

It also does not check if its input parameter 'handled' is
is non NULL like its siblings, so add a check.

Fixes: a0ec8d1d ("media: tc358743: add CEC support")
Signed-off-by: NTom Rix <trix@redhat.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab+huawei@kernel.org>
上级 2d307380
...@@ -919,8 +919,8 @@ static const struct cec_adap_ops tc358743_cec_adap_ops = { ...@@ -919,8 +919,8 @@ static const struct cec_adap_ops tc358743_cec_adap_ops = {
.adap_monitor_all_enable = tc358743_cec_adap_monitor_all_enable, .adap_monitor_all_enable = tc358743_cec_adap_monitor_all_enable,
}; };
static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, static void tc358743_cec_handler(struct v4l2_subdev *sd, u16 intstatus,
bool *handled) bool *handled)
{ {
struct tc358743_state *state = to_state(sd); struct tc358743_state *state = to_state(sd);
unsigned int cec_rxint, cec_txint; unsigned int cec_rxint, cec_txint;
...@@ -953,7 +953,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, ...@@ -953,7 +953,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus,
cec_transmit_attempt_done(state->cec_adap, cec_transmit_attempt_done(state->cec_adap,
CEC_TX_STATUS_ERROR); CEC_TX_STATUS_ERROR);
} }
*handled = true; if (handled)
*handled = true;
} }
if ((intstatus & MASK_CEC_RINT) && if ((intstatus & MASK_CEC_RINT) &&
(cec_rxint & MASK_CECRIEND)) { (cec_rxint & MASK_CECRIEND)) {
...@@ -968,7 +969,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, ...@@ -968,7 +969,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus,
msg.msg[i] = v & 0xff; msg.msg[i] = v & 0xff;
} }
cec_received_msg(state->cec_adap, &msg); cec_received_msg(state->cec_adap, &msg);
*handled = true; if (handled)
*handled = true;
} }
i2c_wr16(sd, INTSTATUS, i2c_wr16(sd, INTSTATUS,
intstatus & (MASK_CEC_RINT | MASK_CEC_TINT)); intstatus & (MASK_CEC_RINT | MASK_CEC_TINT));
...@@ -1432,7 +1434,7 @@ static int tc358743_isr(struct v4l2_subdev *sd, u32 status, bool *handled) ...@@ -1432,7 +1434,7 @@ static int tc358743_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
#ifdef CONFIG_VIDEO_TC358743_CEC #ifdef CONFIG_VIDEO_TC358743_CEC
if (intstatus & (MASK_CEC_RINT | MASK_CEC_TINT)) { if (intstatus & (MASK_CEC_RINT | MASK_CEC_TINT)) {
tc358743_cec_isr(sd, intstatus, handled); tc358743_cec_handler(sd, intstatus, handled);
i2c_wr16(sd, INTSTATUS, i2c_wr16(sd, INTSTATUS,
intstatus & (MASK_CEC_RINT | MASK_CEC_TINT)); intstatus & (MASK_CEC_RINT | MASK_CEC_TINT));
intstatus &= ~(MASK_CEC_RINT | MASK_CEC_TINT); intstatus &= ~(MASK_CEC_RINT | MASK_CEC_TINT);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册