lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 054/264] media: tc358743: cleanup tc358743_cec_isr
    Date
    From: Tom Rix <trix@redhat.com>

    [ 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: a0ec8d1dc42e ("media: tc358743: add CEC support")
    Signed-off-by: Tom Rix <trix@redhat.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/tc358743.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
    index 874673218dd6e..d9bc3851bf63b 100644
    --- a/drivers/media/i2c/tc358743.c
    +++ b/drivers/media/i2c/tc358743.c
    @@ -919,8 +919,8 @@ 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,
    - bool *handled)
    +static void tc358743_cec_handler(struct v4l2_subdev *sd, u16 intstatus,
    + bool *handled)
    {
    struct tc358743_state *state = to_state(sd);
    unsigned int cec_rxint, cec_txint;
    @@ -953,7 +953,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus,
    cec_transmit_attempt_done(state->cec_adap,
    CEC_TX_STATUS_ERROR);
    }
    - *handled = true;
    + if (handled)
    + *handled = true;
    }
    if ((intstatus & MASK_CEC_RINT) &&
    (cec_rxint & MASK_CECRIEND)) {
    @@ -968,7 +969,8 @@ static void tc358743_cec_isr(struct v4l2_subdev *sd, u16 intstatus,
    msg.msg[i] = v & 0xff;
    }
    cec_received_msg(state->cec_adap, &msg);
    - *handled = true;
    + if (handled)
    + *handled = true;
    }
    i2c_wr16(sd, INTSTATUS,
    intstatus & (MASK_CEC_RINT | MASK_CEC_TINT));
    @@ -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);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 19:09    [W:4.122 / U:23.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site