diff options
Diffstat (limited to 'arch/arm/mach-imx/iomux-imx31.c')
-rw-r--r-- | arch/arm/mach-imx/iomux-imx31.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c index 1657fe64cd0f..d6a30753ca7c 100644 --- a/arch/arm/mach-imx/iomux-imx31.c +++ b/arch/arm/mach-imx/iomux-imx31.c | |||
@@ -44,9 +44,11 @@ static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG]; | |||
44 | /* | 44 | /* |
45 | * set the mode for a IOMUX pin. | 45 | * set the mode for a IOMUX pin. |
46 | */ | 46 | */ |
47 | int mxc_iomux_mode(unsigned int pin_mode) | 47 | void mxc_iomux_mode(unsigned int pin_mode) |
48 | { | 48 | { |
49 | u32 field, l, mode, ret = 0; | 49 | u32 field; |
50 | u32 l; | ||
51 | u32 mode; | ||
50 | void __iomem *reg; | 52 | void __iomem *reg; |
51 | 53 | ||
52 | reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK); | 54 | reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK); |
@@ -61,8 +63,6 @@ int mxc_iomux_mode(unsigned int pin_mode) | |||
61 | __raw_writel(l, reg); | 63 | __raw_writel(l, reg); |
62 | 64 | ||
63 | spin_unlock(&gpio_mux_lock); | 65 | spin_unlock(&gpio_mux_lock); |
64 | |||
65 | return ret; | ||
66 | } | 66 | } |
67 | 67 | ||
68 | /* | 68 | /* |