diff options
author | Dmitry Voytik <voytikd@gmail.com> | 2014-11-06 22:55:04 +0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-22 07:39:36 +0800 |
commit | c3008735fce9f9a0f92fd79d4e1f3969d6f33c9f (patch) | |
tree | 54a7771717223271c1ff282131be1098fd3fe553 /arch/arm/mach-imx | |
parent | c400f7a26fa0fa8ea7268cef27f1ba980df54267 (diff) | |
download | linux-exynos-c3008735fce9f9a0f92fd79d4e1f3969d6f33c9f.tar.gz linux-exynos-c3008735fce9f9a0f92fd79d4e1f3969d6f33c9f.tar.bz2 linux-exynos-c3008735fce9f9a0f92fd79d4e1f3969d6f33c9f.zip |
ARM: imx: refactor mxc_iomux_mode()
Refactor mxc_iomux_mode():
- since it always returns 0 make it to return void
- remove unnecessary ret variable
- declare variables according to the kernel coding style
Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/iomux-imx31.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-imx/iomux-mx3.h | 2 |
2 files changed, 5 insertions, 5 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]; /* * set the mode for a IOMUX pin. */ -int mxc_iomux_mode(unsigned int pin_mode) +void mxc_iomux_mode(unsigned int pin_mode) { - u32 field, l, mode, ret = 0; + u32 field; + u32 l; + u32 mode; void __iomem *reg; reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK); @@ -61,8 +63,6 @@ int mxc_iomux_mode(unsigned int pin_mode) __raw_writel(l, reg); spin_unlock(&gpio_mux_lock); - - return ret; } /* diff --git a/arch/arm/mach-imx/iomux-mx3.h b/arch/arm/mach-imx/iomux-mx3.h index f79f78a1c0ed..0a5adba61e0b 100644 --- a/arch/arm/mach-imx/iomux-mx3.h +++ b/arch/arm/mach-imx/iomux-mx3.h @@ -144,7 +144,7 @@ void mxc_iomux_set_gpr(enum iomux_gp_func, bool en); * It is called by the setup functions and should not be called directly anymore. * It is here visible for backward compatibility */ -int mxc_iomux_mode(unsigned int pin_mode); +void mxc_iomux_mode(unsigned int pin_mode); #define IOMUX_PADNUM_MASK 0x1ff #define IOMUX_GPIONUM_SHIFT 9 |