From patchwork Thu Feb 16 18:25:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9930 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Ry61o-00041t-5Q for patchwork@linuxtv.org; Thu, 16 Feb 2012 19:26:00 +0100 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 1Ry61l-0000Wj-Id; Thu, 16 Feb 2012 19:25:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754374Ab2BPSZ5 (ORCPT ); Thu, 16 Feb 2012 13:25:57 -0500 Received: from ch1ehsobe002.messaging.microsoft.com ([216.32.181.182]:49216 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701Ab2BPSZ4 (ORCPT ); Thu, 16 Feb 2012 13:25:56 -0500 Received: from mail192-ch1-R.bigfish.com (10.43.68.236) by CH1EHSOBE017.bigfish.com (10.43.70.67) with Microsoft SMTP Server id 14.1.225.23; Thu, 16 Feb 2012 18:25:55 +0000 Received: from mail192-ch1 (localhost [127.0.0.1]) by mail192-ch1-R.bigfish.com (Postfix) with ESMTP id B4F3E180485; Thu, 16 Feb 2012 18:25:55 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail192-ch1 (localhost.localdomain [127.0.0.1]) by mail192-ch1 (MessageSwitch) id 1329416753827124_15982; Thu, 16 Feb 2012 18:25:53 +0000 (UTC) Received: from CH1EHSMHS019.bigfish.com (snatpool3.int.messaging.microsoft.com [10.43.68.225]) by mail192-ch1.bigfish.com (Postfix) with ESMTP id BA3192A0049; Thu, 16 Feb 2012 18:25:53 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS019.bigfish.com (10.43.70.19) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 16 Feb 2012 18:25:52 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.1.355.3; Thu, 16 Feb 2012 12:25:49 -0600 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.240.140]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q1GIPgYM012047; Thu, 16 Feb 2012 11:25:43 -0700 From: Fabio Estevam To: CC: , , , , , Fabio Estevam Subject: [PATCH] media: video: mx2_camera: Remove ifdef's Date: Thu, 16 Feb 2012 16:25:39 -0200 Message-ID: <1329416739-23566-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.com 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.2.16.181814 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' As we are able to build a same kernel that supports both mx27 and mx25, we should remove the ifdef's for CONFIG_MACH_MX27 in the mx2_camera driver. Signed-off-by: Fabio Estevam Acked-by: Baruch Siach --- drivers/media/video/mx2_camera.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 04aab0c..afb4619 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -38,9 +38,7 @@ #include #include -#ifdef CONFIG_MACH_MX27 #include -#endif #include #include @@ -402,7 +400,6 @@ static void mx2_camera_remove_device(struct soc_camera_device *icd) pcdev->icd = NULL; } -#ifdef CONFIG_MACH_MX27 static void mx27_camera_dma_enable(struct mx2_camera_dev *pcdev) { u32 tmp; @@ -419,6 +416,9 @@ static irqreturn_t mx27_camera_irq(int irq_csi, void *data) struct mx2_camera_dev *pcdev = data; u32 status = readl(pcdev->base_csi + CSISR); + if(!cpu_is_mx27()) + return IRQ_NONE; + if (status & CSISR_SOF_INT && pcdev->active) { u32 tmp; @@ -431,12 +431,6 @@ static irqreturn_t mx27_camera_irq(int irq_csi, void *data) return IRQ_HANDLED; } -#else -static irqreturn_t mx27_camera_irq(int irq_csi, void *data) -{ - return IRQ_NONE; -} -#endif /* CONFIG_MACH_MX27 */ static void mx25_camera_frame_done(struct mx2_camera_dev *pcdev, int fb, int state) @@ -619,7 +613,6 @@ static void mx2_videobuf_queue(struct videobuf_queue *vq, if (mx27_camera_emma(pcdev)) { goto out; -#ifdef CONFIG_MACH_MX27 } else if (cpu_is_mx27()) { int ret; @@ -637,7 +630,6 @@ static void mx2_videobuf_queue(struct videobuf_queue *vq, vb->state = VIDEOBUF_ACTIVE; pcdev->active = buf; } -#endif } else { /* cpu_is_mx25() */ u32 csicr3, dma_inten = 0; @@ -1201,7 +1193,6 @@ static int mx2_camera_reqbufs(struct soc_camera_device *icd, return 0; } -#ifdef CONFIG_MACH_MX27 static void mx27_camera_frame_done(struct mx2_camera_dev *pcdev, int state) { struct videobuf_buffer *vb; @@ -1310,7 +1301,6 @@ err_out: return err; } -#endif /* CONFIG_MACH_MX27 */ static unsigned int mx2_camera_poll(struct file *file, poll_table *pt) { @@ -1558,13 +1548,11 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev) clk_get_rate(pcdev->clk_csi)); /* Initialize DMA */ -#ifdef CONFIG_MACH_MX27 if (cpu_is_mx27()) { err = mx27_camera_dma_init(pdev, pcdev); if (err) goto exit_clk_put; } -#endif /* CONFIG_MACH_MX27 */ pcdev->res_csi = res_csi; pcdev->pdata = pdev->dev.platform_data; @@ -1657,12 +1645,10 @@ exit_iounmap: exit_release: release_mem_region(res_csi->start, resource_size(res_csi)); exit_dma_free: -#ifdef CONFIG_MACH_MX27 if (cpu_is_mx27()) imx_dma_free(pcdev->dma); exit_clk_put: clk_put(pcdev->clk_csi); -#endif /* CONFIG_MACH_MX27 */ exit_kfree: kfree(pcdev); exit: @@ -1677,10 +1663,8 @@ static int __devexit mx2_camera_remove(struct platform_device *pdev) struct resource *res; clk_put(pcdev->clk_csi); -#ifdef CONFIG_MACH_MX27 if (cpu_is_mx27()) imx_dma_free(pcdev->dma); -#endif /* CONFIG_MACH_MX27 */ free_irq(pcdev->irq_csi, pcdev); if (mx27_camera_emma(pcdev)) free_irq(pcdev->irq_emma, pcdev);