summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 14:40:41 +0100
committerArnd Bergmann <arnd@arndb.de>2012-02-27 14:40:49 +0100
commit96a3eab338c01e172745b1686c51c1be96ce9ead (patch)
tree5a53947a192549d9edf63550258e1bddf6f1d794 /arch/arm/plat-mxc
parentMerge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-a... (diff)
parentARM: Remove redundant ';' from avic_irq_set_priority() (diff)
downloadlinux-96a3eab338c01e172745b1686c51c1be96ce9ead.tar.xz
linux-96a3eab338c01e172745b1686c51c1be96ce9ead.zip
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
* 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits) ARM: Remove redundant ';' from avic_irq_set_priority() ARM: mx3: Let mx31 and mx35 share the same CCM header file ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's Update to v3.3-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/audmux-v1.c5
-rw-r--r--arch/arm/plat-mxc/avic.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c
index 1180bef7664b..14a3c0486750 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;
diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index 55f15699a383..689f81f9593b 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;