From patchwork Fri Oct 5 15:47:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1554331 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8ECB73FE80 for ; Fri, 5 Oct 2012 15:47:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751172Ab2JEPrT (ORCPT ); Fri, 5 Oct 2012 11:47:19 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:58440 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750Ab2JEPrS (ORCPT ); Fri, 5 Oct 2012 11:47:18 -0400 Received: from axis700.grange (dslb-094-221-125-045.pools.arcor-ip.net [94.221.125.45]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MMtUx-1TKT6b430p-008Wpr; Fri, 05 Oct 2012 17:47:15 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 9A67F40BB8; Fri, 5 Oct 2012 17:47:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 8F3E540BB7; Fri, 5 Oct 2012 17:47:14 +0200 (CEST) Date: Fri, 5 Oct 2012 17:47:14 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Albert Wang Subject: [PATCH] media: soc-camera: remove superfluous JPEG checking Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:9KJK8zJQGuucMX4C+fvCokdY6/9vHjC9SevwT8IsIWb 12Tf1wozDnfYOa8iSuJa67uP9PTJm7MP1Uq8QAQecY9Rfu230+ 58NOpz9SlMTcYWdY3doeTv/+9/7lIqw+ctEKOpPsCWEqvLEh8+ QTFPaJLv4zJXmMMlmrsODJxh6rT7S/GLwxn+uqBz8CCkIivBWt 7AEeQt3lN7+UY/vpwHxOw813O/138d3UaFGz3/OnTUBcdE6E83 TgKx7bFCBhYNiVOmmg+32GWubJxf0eGGKBB9ffA+n9dX2XiYYq Gxgecdl0ceg9IzcX4gxRLgtJHIp5MDSJlWCnfKLoQkDTQ7gbNU wZ+L6se6PyBGPhiXtXNBtn6FbWhcYGI5r7sxK0tgO/Sw1zvIyE UpCYCAkTLX2aA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Explicit checks for the JPEG pixel format in soc_mbus_bytes_per_line() and soc_mbus_image_size() are superfluous, because also without them these functions will perform correctly. The former will return 0 based on packing == SOC_MBUS_PACKING_VARIABLE and the latter will simply multiply the user-provided line length by the image height to obtain a frame buffer size estimate. The original version of the "media: soc_camera: don't clear pix->sizeimage in JPEG mode" patch was correct and my amendment, adding these two checks was superfluous. Signed-off-by: Guennadi Liakhovetski --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c index a397812..89dce09 100644 --- a/drivers/media/platform/soc_camera/soc_mediabus.c +++ b/drivers/media/platform/soc_camera/soc_mediabus.c @@ -378,9 +378,6 @@ EXPORT_SYMBOL(soc_mbus_samples_per_pixel); s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf) { - if (mf->fourcc == V4L2_PIX_FMT_JPEG) - return 0; - if (mf->layout != SOC_MBUS_LAYOUT_PACKED) return width * mf->bits_per_sample / 8; @@ -403,9 +400,6 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line); s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf, u32 bytes_per_line, u32 height) { - if (mf->fourcc == V4L2_PIX_FMT_JPEG) - return 0; - if (mf->layout == SOC_MBUS_LAYOUT_PACKED) return bytes_per_line * height;