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: 1482911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DD9E5DF2D2 for ; Thu, 20 Sep 2012 07:02:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEak7-0001jX-UM; Thu, 20 Sep 2012 07:00:12 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEaXy-0001vN-DD for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 06:47:40 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so4539723pbb.36 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=JcIlmPQ7LqLKSHFoY3BvEGAq+E9Pw5b2OK6QoqH+WI8pz46hh8wSnJvf2JcwBeAcdn +WGBCQD5QQMRSYyeD8N6nRF28Lo4JGXWjy2s63EddcS4DxlRRj3F6FZGhgzAh293sfX1 vR4HXuP/bQo+HDDO6oIzlsJKvOSdPcdAMdqC8rJqNBkuvm7xa3bU8BBxi4Dj4vpPNOaO eB401J+0gUDMsZY96r4brv1tGKmueuGHFB8bmgSYH51chLGhWWX64cHoCpo8LDybXv0k h5pbhydVZlFtdcS5qNf+T3iQmmvgJ2IjG++rrE8/Hc3WSHCI/lFR2pB2dTzEs/XvHO9v rrJQ== 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 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: ALoCoQkIcVOeZAgHgbtpeH4IUL9XcR6NnBV/vQkJNzaL2kuDOCu+t6HPgbpGbgy2LJT8Ou2t6De2 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Arnd Bergmann , Sascha Hauer , Rob Herring , Javier Martin , Shawn Guo , linux-media@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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);