Commit f8951dce authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Shawn Guo
Browse files

ARM: imx: Remove imx_add_imx_dma() unused irq_err argument 



No callers of imx_add_imx_dma() need an error IRQ, so they supply 0 as
"irq_err", which means we register a resource of IRQ 0, which is invalid
and causes a warning if used.

Remove the "irq_err" argument altogether so there's no chance of trying to
use the invalid IRQ 0.

Fixes: a85a6c86 ("driver core: platform: Clarify that IRQ 0 is invalid")
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: kernel@pengutronix.de
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-imx@nxp.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 2a835440

arch/arm/mach-imx/devices/devices-common.h

+1 −1
Original line number Diff line number Diff line
@@ -289,6 +289,6 @@ struct platform_device *__init imx_add_spi_imx( 
		const struct spi_imx_master *pdata);



struct platform_device *imx_add_imx_dma(char *name, resource_size_t iobase,

					int irq, int irq_err);

					int irq);

struct platform_device *imx_add_imx_sdma(char *name,

	resource_size_t iobase, int irq, struct sdma_platform_data *pdata);

arch/arm/mach-imx/devices/platform-imx-dma.c

+1 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "devices-common.h"



struct platform_device __init __maybe_unused *imx_add_imx_dma(char *name,

	resource_size_t iobase, int irq, int irq_err)

	resource_size_t iobase, int irq)

{

	struct resource res[] = {

		{
@@ -17,10 +17,6 @@ struct platform_device __init __maybe_unused *imx_add_imx_dma(char *name, 
			.start = irq,

			.end = irq,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = irq_err,

			.end = irq_err,

			.flags = IORESOURCE_IRQ,

		},

	};

arch/arm/mach-imx/mm-imx21.c

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ void __init imx21_soc_init(void) 
	mxc_register_gpio("imx21-gpio", 5, MX21_GPIO6_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);



	pinctrl_provide_dummies();

	imx_add_imx_dma("imx21-dma", MX21_DMA_BASE_ADDR,

			MX21_INT_DMACH0, 0); /* No ERR irq */

	imx_add_imx_dma("imx21-dma", MX21_DMA_BASE_ADDR, MX21_INT_DMACH0);

	platform_device_register_simple("imx21-audmux", 0, imx21_audmux_res,

					ARRAY_SIZE(imx21_audmux_res));

}

arch/arm/mach-imx/mm-imx27.c

+1 −2
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ void __init imx27_soc_init(void) 
	mxc_register_gpio("imx21-gpio", 5, MX27_GPIO6_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);



	pinctrl_provide_dummies();

	imx_add_imx_dma("imx27-dma", MX27_DMA_BASE_ADDR,

			MX27_INT_DMACH0, 0); /* No ERR irq */

	imx_add_imx_dma("imx27-dma", MX27_DMA_BASE_ADDR, MX27_INT_DMACH0);

	/* imx27 has the imx21 type audmux */

	platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res,

					ARRAY_SIZE(imx27_audmux_res));

CRA Git | Maintained and supported by SUSTech CRA and CCSE