lkml.org 
[lkml]   [2019]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 181/239] media: davinci: Fix implicit enum conversion warning
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 4158757395b300b6eb308fc20b96d1d231484413 ]

    Clang warns when one enumerated type is implicitly converted to another.

    drivers/media/platform/davinci/vpbe_display.c:524:24: warning: implicit
    conversion from enumeration type 'enum osd_v_exp_ratio' to different
    enumeration type 'enum osd_h_exp_ratio' [-Wenum-conversion]
    layer_info->h_exp = V_EXP_6_OVER_5;
    ~ ^~~~~~~~~~~~~~
    1 warning generated.

    This appears to be a copy and paste error judging from the couple of
    lines directly above this statement and the way that height is handled
    in the if block above this one.

    Reported-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/davinci/vpbe_display.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
    index 13d027031ff04..82b06cc48bd16 100644
    --- a/drivers/media/platform/davinci/vpbe_display.c
    +++ b/drivers/media/platform/davinci/vpbe_display.c
    @@ -518,7 +518,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,
    else if (v_scale == 4)
    layer_info->v_zoom = ZOOM_X4;
    if (v_exp)
    - layer_info->h_exp = V_EXP_6_OVER_5;
    + layer_info->v_exp = V_EXP_6_OVER_5;
    } else {
    /* no scaling, only cropping. Set display area to crop area */
    cfg->ysize = expected_ysize;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-19 06:57    [W:4.523 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site