From: Stricted <info@stricted.net> Date: Sat, 19 Jun 2021 23:05:13 +0000 (+0000) Subject: amlogic: osd: Fix self assign warnings X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73257d78627dc5df3b893d816ad9c7bf01cf45a6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git amlogic: osd: Fix self assign warnings Change-Id: Ib7cbf268dcaf9115c423f5fea3eb88c5819aea24 --- diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index a78a53141b30..6aa44fa22568 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -1857,8 +1857,7 @@ static u32 line_stride_calc( /* need wr ddr is 32bytes aligned */ if (stride_align_32bytes) line_stride = ((line_stride+1)>>1)<<1; - else - line_stride = line_stride; + return line_stride; } @@ -1889,8 +1888,7 @@ static u32 line_stride_calc_afbc( /* need wr ddr is 32bytes aligned */ if (stride_align_32bytes) line_stride = ((line_stride+1) >> 1) << 1; - else - line_stride = line_stride; + return line_stride; }