Skip to content

Commit

Permalink
[media] staging: media: davinci_vpfe: drop condition with no effect
Browse files Browse the repository at this point in the history
As the if and else branch body are identical the condition has no effect and
can be dropped.

Signed-off-by: Nicholas Mc Guire <[email protected]>
Acked-by: Lad, Prabhakar <[email protected]>
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
hofrat authored and mchehab committed Nov 17, 2015
1 parent 80a7f72 commit d9f4844
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/staging/media/davinci_vpfe/dm365_resizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,11 @@ resizer_calculate_line_length(u32 pix, int width, int height,
if (pix == MEDIA_BUS_FMT_UYVY8_2X8 ||
pix == MEDIA_BUS_FMT_SGRBG12_1X12) {
*line_len = width << 1;
} else if (pix == MEDIA_BUS_FMT_Y8_1X8 ||
pix == MEDIA_BUS_FMT_UV8_1X8) {
*line_len = width;
*line_len_c = width;
} else {
/* YUV 420 */
/* round width to upper 32 byte boundary */
*line_len = width;
*line_len_c = width;
}

/* adjust the line len to be a multiple of 32 */
*line_len += 31;
*line_len &= ~0x1f;
Expand Down

0 comments on commit d9f4844

Please sign in to comment.