Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3008735 authored by Dmitry Voytik's avatar Dmitry Voytik Committed by Shawn Guo
Browse files

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: default avatarDmitry Voytik <voytikd@gmail.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c400f7a2

arch/arm/mach-imx/iomux-imx31.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}



/*

arch/arm/mach-imx/iomux-mx3.h

+1 −1
Original line number Diff line number Diff line
@@ -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