From 48d795616c73935fd72d30ae63ff8b3f2d6bfaa7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 16 Feb 2012 22:15:37 -0200 Subject: ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's As we are able to build a single kernel that can run on mx21 and mx27, there is no need for the ifdef's anymore inside audmux-v1.c. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/plat-mxc/audmux-v1.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/arm/plat-mxc') diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c index 1180bef..14a3c04 100644 --- a/arch/arm/plat-mxc/audmux-v1.c +++ b/arch/arm/plat-mxc/audmux-v1.c @@ -46,16 +46,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port); static int mxc_audmux_v1_init(void) { -#ifdef CONFIG_MACH_MX21 if (cpu_is_mx21()) audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR); else -#endif -#ifdef CONFIG_MACH_MX27 + if (cpu_is_mx27()) audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR); else -#endif (void)0; return 0; -- cgit v1.1 From a5a928c51f807262a13e6e3412e0e1324f6b7aeb Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 26 Feb 2012 23:09:40 +0100 Subject: ARM: Remove redundant ';' from avic_irq_set_priority() One semi-colon at the end of the return statement is sufficient. Signed-off-by: Jesper Juhl Signed-off-by: Sascha Hauer --- arch/arm/plat-mxc/avic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/plat-mxc') diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c index 55f1569..689f81f 100644 --- a/arch/arm/plat-mxc/avic.c +++ b/arch/arm/plat-mxc/avic.c @@ -60,7 +60,7 @@ static int avic_irq_set_priority(unsigned char irq, unsigned char prio) unsigned int mask = 0x0F << irq % 8 * 4; if (irq >= AVIC_NUM_IRQS) - return -EINVAL;; + return -EINVAL; temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8)); temp &= ~mask; -- cgit v1.1