diff options
author | Darius Augulis <augulis.darius@gmail.com> | 2009-04-08 09:17:50 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-16 07:03:11 -0400 |
commit | 3f2030163efe4a7ee820ae56dab9a4db8c1ebb49 (patch) | |
tree | cff93721de6e9f5ae9abe58a2dd3fc1651669ecc /arch/arm/plat-mxc/irq.c | |
parent | 3fa6dd6a7aa7ce1a7d490ef88c2c8ec7db0f196b (diff) |
Fix ifdef in plat-mxc/irc.c
Move ifdef under function brackets. This fixes compile crach when IRQ priorities
are disabled.
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Diffstat (limited to 'arch/arm/plat-mxc/irq.c')
-rw-r--r-- | arch/arm/plat-mxc/irq.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c index 6e7578a3514b..0fb68a531f55 100644 --- a/arch/arm/plat-mxc/irq.c +++ b/arch/arm/plat-mxc/irq.c | |||
@@ -50,23 +50,27 @@ | |||
50 | #define IIM_PROD_REV_SH 3 | 50 | #define IIM_PROD_REV_SH 3 |
51 | #define IIM_PROD_REV_LEN 5 | 51 | #define IIM_PROD_REV_LEN 5 |
52 | 52 | ||
53 | #ifdef CONFIG_MXC_IRQ_PRIOR | 53 | int imx_irq_set_priority(unsigned char irq, unsigned char prio) |
54 | void imx_irq_set_priority(unsigned char irq, unsigned char prio) | ||
55 | { | 54 | { |
55 | #ifdef CONFIG_MXC_IRQ_PRIOR | ||
56 | unsigned int temp; | 56 | unsigned int temp; |
57 | unsigned int mask = 0x0F << irq % 8 * 4; | 57 | unsigned int mask = 0x0F << irq % 8 * 4; |
58 | 58 | ||
59 | if (irq > 63) | 59 | if (irq >= MXC_INTERNAL_IRQS) |
60 | return; | 60 | return -EINVAL;; |
61 | 61 | ||
62 | temp = __raw_readl(AVIC_NIPRIORITY(irq / 8)); | 62 | temp = __raw_readl(AVIC_NIPRIORITY(irq / 8)); |
63 | temp &= ~mask; | 63 | temp &= ~mask; |
64 | temp |= prio & mask; | 64 | temp |= prio & mask; |
65 | 65 | ||
66 | __raw_writel(temp, AVIC_NIPRIORITY(irq / 8)); | 66 | __raw_writel(temp, AVIC_NIPRIORITY(irq / 8)); |
67 | |||
68 | return 0; | ||
69 | #else | ||
70 | return -ENOSYS; | ||
71 | #endif | ||
67 | } | 72 | } |
68 | EXPORT_SYMBOL(imx_irq_set_priority); | 73 | EXPORT_SYMBOL(imx_irq_set_priority); |
69 | #endif | ||
70 | 74 | ||
71 | #ifdef CONFIG_FIQ | 75 | #ifdef CONFIG_FIQ |
72 | int mxc_set_irq_fiq(unsigned int irq, unsigned int type) | 76 | int mxc_set_irq_fiq(unsigned int irq, unsigned int type) |