diff options
author | Jesper Nilsson <jespern@axis.com> | 2014-10-27 04:11:31 -0400 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2014-12-19 18:06:04 -0500 |
commit | a3199ad90ac33c1afae0fa3dbf2e0fe4ee827fa7 (patch) | |
tree | e3f1feb76da1db3d59351ed2c19707bed2855882 /arch/cris/include | |
parent | 9f1ad51b32173a2da3c4fab58bc4f87d6094868f (diff) |
CRISv32: ETRAXFS: Fix recursive spinlock
Move pinmux alloc/dealloc code into functions that don't take
the spinlock so we can use from code that has the spinlock already.
CRISv32 has no working SMP, so spinlocks becomes a NOP,
so deadlock was never seen.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/include')
-rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h index c2b3036779df..09bf0c90d2d3 100644 --- a/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | |||
@@ -28,11 +28,9 @@ enum fixed_function { | |||
28 | pinmux_timer | 28 | pinmux_timer |
29 | }; | 29 | }; |
30 | 30 | ||
31 | int crisv32_pinmux_init(void); | ||
32 | int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode); | 31 | int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode); |
33 | int crisv32_pinmux_alloc_fixed(enum fixed_function function); | 32 | int crisv32_pinmux_alloc_fixed(enum fixed_function function); |
34 | int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin); | 33 | int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin); |
35 | int crisv32_pinmux_dealloc_fixed(enum fixed_function function); | 34 | int crisv32_pinmux_dealloc_fixed(enum fixed_function function); |
36 | void crisv32_pinmux_dump(void); | ||
37 | 35 | ||
38 | #endif | 36 | #endif |