From patchwork Mon Sep 17 05:34:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1465061 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 BB3953FCFC for ; Mon, 17 Sep 2012 05:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275Ab2IQFgz (ORCPT ); Mon, 17 Sep 2012 01:36:55 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:64439 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266Ab2IQFgy (ORCPT ); Mon, 17 Sep 2012 01:36:54 -0400 Received: by pbbrr13 with SMTP id rr13so8486026pbb.19 for ; Sun, 16 Sep 2012 22:36:54 -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=UKCKwiBEO5LJMttn0OhBWOLZIpRL6Y6iTrw0JPWkemc=; b=i0x34xIvAJzd1bfaJfGzEiuZG5NXWvEgo1LGDyr/AguzpO8282RPZha1UTzTT+ij9w YDRr9kDJnfkT6b1mq3MHk1BHxZPHpAxHr5DVthWKvaJKx7z/W42jQ/gXZ3eoNU9iahMp ILkfQUPkFwwpc4ejKKjoLi61KCJ9pUY/TogT0G4VicKRsm5REVLTpSR9cS10+fj5y3E0 i0q9x0LYyr+L4U3ng97elKIBv2E1uqjo9JmBIc4jdzK6YpzJ8bJpLAMHgohYci91nzSD hq7qGxXSO/l4e/CKhOT8F/zNc/vl7KqS4yKVhaBZpykpUw0mtaaCabybwvFwCYMpA8a4 fHhg== Received: by 10.68.229.6 with SMTP id sm6mr20213472pbc.120.1347860214344; Sun, 16 Sep 2012 22:36:54 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.36.49 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:36:53 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: Sascha Hauer , Fabio Estevam , Rob Herring , Arnd Bergmann , Shawn Guo , Guennadi Liakhovetski , linux-media@vger.kernel.org Subject: [PATCH 26/34] media: mx2_camera: remove dead code in mx2_camera_add_device Date: Mon, 17 Sep 2012 13:34:55 +0800 Message-Id: <1347860103-4141-27-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQm41/D1qj2shanQNDaqSOFJKhufXYDoYOp+DGzRufSlSlmiOKGhUfTFd++zovOUSOeeTmes Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.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 Cc: Guennadi Liakhovetski Cc: linux-media@vger.kernel.org Acked-by: Guennadi Liakhovetski Acked-by: Javier Martin --- 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);