ARM: imx: refactor mxc_iomux_mode()
Subsystems (3)
PATCH 1/1 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
--- arch/arm/mach-imx/iomux-imx31.c | 8 ++++---- arch/arm/mach-imx/iomux-mx3.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-imx/iomux-imx31.c +4 -4
@@ -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
@@ -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
Signature · 1 line
1.9.1
Hi Shawn,
Any comments on this?
Thanks.
Quoted 59 lines · Dmitry Voytik
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 styleSigned-off-by Dmitry Voytik <[email protected]>--- arch/arm/mach-imx/iomux-imx31.c | 8 ++++---- arch/arm/mach-imx/iomux-mx3.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)arch/arm/mach-imx/iomux-imx31.c +4
-4@@ -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@@ -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 9Signature · 7 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 24 lines · Dmitry Voytik
Quoted 21 lines
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 styleSigned-off-by Dmitry Voytik <[email protected]>--- arch/arm/mach-imx/iomux-imx31.c | 8 ++++---- arch/arm/mach-imx/iomux-mx3.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-imx/iomux-imx31.cindex 1657fe6..d6a3075 100644arch/arm/mach-imx/iomux-imx31.c +0
-1@@ -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)
Quoted 8 lines
arch/arm/mach-imx/iomux-imx31.c static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG]; · line 53
Quoted 8 lines
arch/arm/mach-imx/iomux-imx31.c +4
-1+void mxc_iomux_mode (unsigned int pin_mode) { -u32 field, l, mode, ret =0 ; +u32 field; +u32 l; +u32 mode;void __iomem *reg;
Why you use three lines to define it, it makes the function longer. Besides, Shawn's email changes to : <[email protected]>
Peter
Quoted 39 lines
Quoted 1 line
reg =
IOMUXSW_MUX_CTL+ (pin_mode&IOMUX_REG_MASK); @@ -61,8 +63,6
arch/arm/mach-imx/iomux-mx3.h void mxc_iomux_set_gpr(enum iomux_gp_func, bool
Quoted 14 lines
@@ int
mxc_iomux_mode(unsigned int pin_mode)arch/arm/mach-imx/iomux-imx31.c +0
-2__raw_writel (l, reg);spin_unlock (&gpio_mux_lock); - -return ret; }/* (quoted diff) +0
-0
b/arch/arm/mach-imx/iomux-mx3.hindex f79f78a..0a5adba 100644arch/arm/mach-imx/iomux-mx3.h +0
-0@@ -144,7 +144,7 @@ void mxc_iomux_set_gpr(enum iomux_gp_func, boolen);
arch/arm/mach-imx/iomux-mx3.h void mxc_iomux_set_gpr(enum iomux_gp_func, bool · line 144
Quoted 1 line
arch/arm/mach-imx/iomux-mx3.h +0
-0* It is called by the setup functions and should not be called directly anymore.
Quoted 10 lines
arch/arm/mach-imx/iomux-mx3.h +1
-2* 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 --1.9.1
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Peter,
Quoted 11 lines · Peter Chen
Quoted 9 lines
arch/arm/mach-imx/iomux-imx31.c static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG]; · line 52
Quoted 9 lines
arch/arm/mach-imx/iomux-imx31.c +4
-2-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;Why you use three lines to define it, it makes the function longer.
You're right but there is a recommendation in coding style to declare variables on separate lines (see Documentation/CodingStyle, line 469), which improves readability, imho. By the way I saw many times, that maintainers asked to declare variables separately.
Quoted 1 line
Besides, Shawn's email changes to : <[email protected]>
Oops, didn't see that. Thanks!
WBR.