summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-01-26 05:27:05 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-11-17 14:26:17 -0200
commitd9f4844af8bb7f5c0ef7361aeb9c39be31d45a9a (patch)
treeb86faa532eb7c1535f8cd8bace1e2e84a8777003
parent80a7f727b0b0a1a3c530e39c0c059914e1a7199c (diff)
downloadop-kernel-dev-d9f4844af8bb7f5c0ef7361aeb9c39be31d45a9a.zip
op-kernel-dev-d9f4844af8bb7f5c0ef7361aeb9c39be31d45a9a.tar.gz
[media] staging: media: davinci_vpfe: drop condition with no effect
As the if and else branch body are identical the condition has no effect and can be dropped. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/staging/media/davinci_vpfe/dm365_resizer.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
index acb293e..d892fee 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_resizer.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
@@ -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;
OpenPOWER on IntegriCloud