From: Shawn Guo <shawn.guo@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: Sascha Hauer <s.hauer@pengutronix.de>, Fabio Estevam <fabio.estevam@freescale.com>, Rob Herring <rob.herring@calxeda.com>, Arnd Bergmann <arnd@arndb.de>, Shawn Guo <shawn.guo@linaro.org>, Guennadi Liakhovetski <g.liakhovetski@gmx.de>, 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 [thread overview] Message-ID: <1347860103-4141-27-git-send-email-shawn.guo@linaro.org> (raw) In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.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 <shawn.guo@linaro.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> 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); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: shawn.guo@linaro.org (Shawn Guo) To: linux-arm-kernel@lists.infradead.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 [thread overview] Message-ID: <1347860103-4141-27-git-send-email-shawn.guo@linaro.org> (raw) In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.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 <shawn.guo@linaro.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: linux-media at 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); -- 1.7.9.5
next prev parent reply other threads:[~2012-09-17 5:36 UTC|newest] Thread overview: 154+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-17 5:34 [PATCH 00/34] i.MX multi-platform support Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 01/34] ARM: imx: include board headers in the same folder Shawn Guo 2012-09-17 5:34 ` [PATCH 02/34] ASoC: mx27vis: retrieve gpio numbers from platform_data Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 9:19 ` javier Martin 2012-09-17 9:19 ` javier Martin 2012-09-17 11:07 ` Mark Brown 2012-09-17 11:07 ` Mark Brown 2012-09-20 1:14 ` Shawn Guo 2012-09-20 1:14 ` Shawn Guo 2012-09-20 1:26 ` Mark Brown 2012-09-20 1:26 ` Mark Brown 2012-09-20 2:20 ` Shawn Guo 2012-09-20 2:20 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 03/34] ARM: imx: move iomux drivers and headers into mach-imx Shawn Guo 2012-09-17 5:34 ` [PATCH 04/34] ARM: imx: remove unnecessary inclusion from device-imx*.h Shawn Guo 2012-09-17 5:34 ` [PATCH 05/34] ARM: imx: move platform device code into mach-imx Shawn Guo 2012-09-17 5:34 ` [PATCH 06/34] ARM: imx: merge plat-mxc " Shawn Guo 2012-09-18 8:08 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 07/34] ARM: imx: include common.h rather than mach/common.h Shawn Guo 2012-09-17 5:34 ` [PATCH 08/34] ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h Shawn Guo 2012-09-17 5:34 ` [PATCH 09/34] ARM: imx: include iim.h rather than mach/iim.h Shawn Guo 2012-09-17 5:34 ` [PATCH 10/34] ARM: imx: include iram.h rather than mach/iram.h Shawn Guo 2012-09-17 5:34 ` [PATCH 11/34] ARM: imx: include ulpi.h rather than mach/ulpi.h Shawn Guo 2012-09-17 5:34 ` [PATCH 12/34] media: mx1_camera: remove the driver Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 8:33 ` Guennadi Liakhovetski 2012-09-17 8:33 ` Guennadi Liakhovetski 2012-09-18 1:28 ` Shawn Guo 2012-09-18 1:28 ` Shawn Guo 2012-09-18 9:13 ` Arnd Bergmann 2012-09-18 9:13 ` Arnd Bergmann 2012-09-20 1:35 ` Shawn Guo 2012-09-20 1:35 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 13/34] ARM: imx: remove mach/dma-mx1-mx2.h Shawn Guo 2012-09-17 5:34 ` [PATCH 14/34] dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 9:26 ` Guennadi Liakhovetski 2012-09-17 9:26 ` Guennadi Liakhovetski 2012-09-17 9:26 ` Guennadi Liakhovetski 2012-09-27 7:38 ` Mauro Carvalho Chehab 2012-09-27 7:38 ` Mauro Carvalho Chehab 2012-09-27 7:38 ` Mauro Carvalho Chehab 2012-09-17 5:34 ` [PATCH 15/34] dma: imx-sdma: remove unneeded mach/hardware.h inclusion Shawn Guo 2012-09-17 5:34 ` [PATCH 16/34] ASoC: imx-ssi: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 11:45 ` Mark Brown 2012-09-17 11:45 ` Mark Brown 2012-09-17 14:30 ` Arnd Bergmann 2012-09-17 14:30 ` Arnd Bergmann 2012-09-19 3:23 ` Mark Brown 2012-09-19 3:23 ` Mark Brown 2012-09-19 8:01 ` Arnd Bergmann 2012-09-19 8:01 ` Arnd Bergmann 2012-09-19 11:44 ` Mark Brown 2012-09-19 11:44 ` Mark Brown 2012-09-17 5:34 ` [PATCH 17/34] usb: ehci-mxc: " Shawn Guo 2012-09-17 11:18 ` Greg Kroah-Hartman 2012-09-17 5:34 ` [PATCH 18/34] video: mx3fb: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 19/34] watchdog: imx2_wdt: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo [not found] ` <1347860103-4141-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-09-17 5:34 ` [PATCH 20/34] i2c: imx: remove " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 21/34] mtd: mxc_nand: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 22/34] rtc: mxc_rtc: " Shawn Guo 2012-09-17 5:34 ` [PATCH 23/34] dma: imx-dma: use devm_kzalloc and devm_request_irq Shawn Guo 2012-09-17 5:34 ` [PATCH 24/34] dma: imx-dma: retrieve MEM and IRQ from resources Shawn Guo 2012-09-17 5:34 ` [PATCH 25/34] dma: imx-dma: remove mach/hardware.h inclusion Shawn Guo 2012-09-17 7:58 ` Sascha Hauer 2012-09-18 1:40 ` Shawn Guo 2012-09-21 2:49 ` Shawn Guo 2012-09-17 5:34 ` Shawn Guo [this message] 2012-09-17 5:34 ` [PATCH 26/34] media: mx2_camera: remove dead code in mx2_camera_add_device Shawn Guo 2012-09-17 8:18 ` Guennadi Liakhovetski 2012-09-17 8:18 ` Guennadi Liakhovetski 2012-09-17 13:36 ` javier Martin 2012-09-17 13:36 ` javier Martin 2012-09-18 1:49 ` Shawn Guo 2012-09-18 1:49 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 27/34] media: mx2_camera: use managed functions to clean up code Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 9:11 ` Guennadi Liakhovetski 2012-09-17 9:11 ` Guennadi Liakhovetski 2012-09-17 13:36 ` javier Martin 2012-09-17 13:36 ` javier Martin 2012-09-18 7:43 ` Shawn Guo 2012-09-18 7:43 ` Shawn Guo 2012-09-18 8:34 ` javier Martin 2012-09-18 8:34 ` javier Martin 2012-09-17 5:34 ` [PATCH 28/34] media: mx2_camera: remove mach/hardware.h inclusion Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 9:21 ` Guennadi Liakhovetski 2012-09-17 9:21 ` Guennadi Liakhovetski 2012-09-17 13:43 ` javier Martin 2012-09-17 13:43 ` javier Martin 2012-09-17 13:59 ` Guennadi Liakhovetski 2012-09-17 13:59 ` Guennadi Liakhovetski 2012-09-18 8:35 ` javier Martin 2012-09-18 8:35 ` javier Martin 2012-09-27 7:36 ` Mauro Carvalho Chehab 2012-09-27 7:36 ` Mauro Carvalho Chehab 2012-10-06 8:16 ` Shawn Guo 2012-10-06 8:16 ` Shawn Guo 2012-09-17 5:34 ` [PATCH 29/34] mmc: mxcmmc: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:41 ` Chris Ball 2012-09-17 5:41 ` Chris Ball 2012-09-18 9:18 ` javier Martin 2012-09-18 9:18 ` javier Martin 2012-09-17 5:34 ` [PATCH 30/34] video: imxfb: " Shawn Guo 2012-09-17 5:34 ` Shawn Guo 2012-09-17 5:35 ` [PATCH 31/34] ARM: imx: move debug macros to include/debug Shawn Guo 2012-09-17 5:35 ` [PATCH 32/34] ARM: imx: include hardware.h rather than mach/hardware.h Shawn Guo 2012-09-17 5:35 ` [PATCH 33/34] ARM: imx: remove header file mach/irqs.h Shawn Guo 2012-09-17 5:35 ` Shawn Guo 2012-09-17 11:32 ` Arnd Bergmann 2012-09-17 11:32 ` Arnd Bergmann 2012-09-18 8:13 ` Shawn Guo 2012-09-18 8:13 ` Shawn Guo 2012-09-17 11:46 ` Mark Brown 2012-09-17 11:46 ` Mark Brown 2012-09-17 5:35 ` [PATCH 34/34] ARM: imx: enable multi-platform build Shawn Guo 2012-09-17 11:44 ` Arnd Bergmann 2012-09-17 7:51 ` [PATCH 00/34] i.MX multi-platform support Sascha Hauer 2012-09-17 7:51 ` Sascha Hauer 2012-09-17 7:51 ` Sascha Hauer 2012-09-17 7:51 ` Sascha Hauer 2012-09-17 7:51 ` Sascha Hauer 2012-09-17 11:38 ` Arnd Bergmann 2012-09-17 11:38 ` Arnd Bergmann 2012-09-17 11:38 ` Arnd Bergmann 2012-09-17 11:38 ` Arnd Bergmann 2012-09-18 8:20 ` Shawn Guo 2012-09-18 8:20 ` Shawn Guo 2012-09-18 8:20 ` Shawn Guo 2012-09-18 8:20 ` Shawn Guo 2012-09-18 8:20 ` Shawn Guo 2012-09-18 7:52 ` Sascha Hauer 2012-09-18 7:52 ` Sascha Hauer 2012-09-18 7:52 ` Sascha Hauer 2012-09-18 7:52 ` Sascha Hauer 2012-09-18 7:52 ` Sascha Hauer 2012-09-18 8:05 ` [alsa-devel] " Shawn Guo 2012-09-18 8:05 ` Shawn Guo 2012-09-18 8:05 ` Shawn Guo 2012-09-18 8:05 ` Shawn Guo 2012-09-18 8:05 ` Shawn Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1347860103-4141-27-git-send-email-shawn.guo@linaro.org \ --to=shawn.guo@linaro.org \ --cc=arnd@arndb.de \ --cc=fabio.estevam@freescale.com \ --cc=g.liakhovetski@gmx.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-media@vger.kernel.org \ --cc=rob.herring@calxeda.com \ --cc=s.hauer@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.