From patchwork Thu Sep 20 06:45:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 14532 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TEaY1-0008OS-RE for patchwork@linuxtv.org; Thu, 20 Sep 2012 08:47:41 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1TEaY1-0000fE-GZ; Thu, 20 Sep 2012 08:47:41 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752941Ab2ITGrj (ORCPT ); Thu, 20 Sep 2012 02:47:39 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47825 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751575Ab2ITGri (ORCPT ); Thu, 20 Sep 2012 02:47:38 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so4370308pbb.19 for ; Wed, 19 Sep 2012 23:47:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=eG/UOtZUAQRrDNHdCkgZHb7OQ3lnaXL3n3Xm1lCXawE=; b=FVYgeDdyazd7iBoIEOp1JO/6WtyXB+VKaKkNQXWwkdAz3nlBHrgB+zZNQqbk+K/iIB 6mek1287EEmhM1HMVJHSsOM8QduXKPpkJl9agU1qhCU0xSKA4TQKxnpGQE5wlxMFhGFO UAjg3mEHlzoHYtd2WkPZWPpfuX6TyM8VKDx1eMtY7Ih3vJJTNfdGzBTa93HtEdnn+YOG NgBuOltE3DjX3U1gwwwW3BOJMiQe4eFFRsY7uBketrMvymbB4kyesHnInPauR9lnwCST tO3mgF6rQaOWSDUvWlz22rMEDYe/OKfww0Ooa6sojKHsV0viMWCK7OoVkFira3JSLwgU SHRw== Received: by 10.66.76.135 with SMTP id k7mr3123664paw.2.1348123658133; Wed, 19 Sep 2012 23:47:38 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([114.216.234.161]) by mx.google.com with ESMTPS id wn1sm3057024pbc.57.2012.09.19.23.47.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 23:47:37 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: Sascha Hauer , Javier Martin , Rob Herring , Arnd Bergmann , Shawn Guo , linux-media@vger.kernel.org Subject: [PATCH v2 25/34] media: mx2_camera: remove dead code in mx2_camera_add_device Date: Thu, 20 Sep 2012 14:45:38 +0800 Message-Id: <1348123547-31082-26-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQk7vwg9IwyuKVg2uTPL72WXXgagUNnVjuK1cQMnriCn/ICxNeb0Sh9MzLqtZy3/ImzyAqb2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.9.20.63917 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __DATE_TZ_HK 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' This is a piece of code becoming dead since commit 2c9ba37 ([media] V4L: mx2_camera: remove unsupported i.MX27 DMA mode, make EMMA mandatory). It should have been removed together with the commit. Remove it now. Signed-off-by: Shawn Guo Acked-by: Sascha Hauer Acked-by: Arnd Bergmann Acked-by: Guennadi Liakhovetski Acked-by: Javier Martin Cc: linux-media@vger.kernel.org --- drivers/media/video/mx2_camera.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 965427f..89c7e28 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -441,11 +441,9 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) csicr1 = CSICR1_MCLKEN; - if (cpu_is_mx27()) { + if (cpu_is_mx27()) csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC | CSICR1_RXFF_LEVEL(0); - } else if (cpu_is_mx27()) - csicr1 |= CSICR1_SOF_INTEN | CSICR1_RXFF_LEVEL(2); pcdev->csicr1 = csicr1; writel(pcdev->csicr1, pcdev->base_csi + CSICR1);