Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e19d4e69 authored by Tom Rix's avatar Tom Rix Committed by Greg Kroah-Hartman
Browse files

media: tc358743: cleanup tc358743_cec_isr 



[ Upstream commit 877cb8a444dad2304e891294afb0915fe3c278d6 ]

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: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6757a430

drivers/media/i2c/tc358743.c

+7 −5
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static const struct cec_adap_ops tc358743_cec_adap_ops = { 
	.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)

{

	struct tc358743_state *state = to_state(sd);
@@ -953,6 +953,7 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, 
			cec_transmit_attempt_done(state->cec_adap,

						  CEC_TX_STATUS_ERROR);

		}

		if (handled)

			*handled = true;

	}

	if ((intstatus & MASK_CEC_RINT) &&
@@ -968,6 +969,7 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus, 
			msg.msg[i] = v & 0xff;

		}

		cec_received_msg(state->cec_adap, &msg);

		if (handled)

			*handled = true;

	}

	i2c_wr16(sd, INTSTATUS,
@@ -1432,7 +1434,7 @@ static int tc358743_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 


#ifdef CONFIG_VIDEO_TC358743_CEC

	if (intstatus & (MASK_CEC_RINT | MASK_CEC_TINT)) {

		tc358743_cec_isr(sd, intstatus, handled);

		tc358743_cec_handler(sd, intstatus, handled);

		i2c_wr16(sd, INTSTATUS,

			 intstatus & (MASK_CEC_RINT | MASK_CEC_TINT));

		intstatus &= ~(MASK_CEC_RINT | MASK_CEC_TINT);