From mboxrd@z Thu Jan 1 00:00:00 1970 From: s.hauer@pengutronix.de (Sascha Hauer) Date: Tue, 16 Oct 2012 23:35:32 +0200 Subject: [PATCH 03/10] [media] mx1_camera: Don't use {en,dis}able_fiq() calls In-Reply-To: <1350337894-9744-3-git-send-email-anton.vorontsov@linaro.org> References: <20121015214954.GA3352@lizard> <1350337894-9744-3-git-send-email-anton.vorontsov@linaro.org> Message-ID: <20121016213532.GG27665@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Oct 15, 2012 at 02:51:27PM -0700, Anton Vorontsov wrote: > The driver uses platform-specific mxc_set_irq_fiq() with the VIRQ cookie > passed to it, so it's pretty clear that the driver is absolutely sure > that the FIQ is routed via platform-specific IC, and that the cookie can > be used to mask/unmask FIQs. So, let's switch to the genirq routines, > since we're about to remove FIQ-specific variants. > > Signed-off-by: Anton Vorontsov Acked-by: Sascha Hauer > --- > drivers/media/platform/soc_camera/mx1_camera.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/soc_camera/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c > index bbe7099..4855a46 100644 > --- a/drivers/media/platform/soc_camera/mx1_camera.c > +++ b/drivers/media/platform/soc_camera/mx1_camera.c > @@ -801,7 +801,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) > set_fiq_regs(®s); > > mxc_set_irq_fiq(irq, 1); > - enable_fiq(irq); > + enable_irq(irq); > > pcdev->soc_host.drv_name = DRIVER_NAME; > pcdev->soc_host.ops = &mx1_soc_camera_host_ops; > @@ -817,7 +817,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) > return 0; > > exit_free_irq: > - disable_fiq(irq); > + disable_irq(irq); > mxc_set_irq_fiq(irq, 0); > release_fiq(&fh); > exit_free_dma: > @@ -842,7 +842,7 @@ static int __exit mx1_camera_remove(struct platform_device *pdev) > struct resource *res; > > imx_dma_free(pcdev->dma_chan); > - disable_fiq(pcdev->irq); > + disable_irq(pcdev->irq); > mxc_set_irq_fiq(pcdev->irq, 0); > release_fiq(&fh); > > -- > 1.7.12.3 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |