Skip to contentSkip to conversation

ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's

PATCH New Fabio Estevam 2 participants 2 messages Feb 17, 2012 – Feb 18, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/1 ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's

As we are able to build a single kernel that can run on mx21 and mx27, there is no need for the ifdef's anymore inside audmux-v1.c.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Replace mx25 with mx27 in the commit message

 arch/arm/plat-mxc/audmux-v1.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/arm/plat-mxc/audmux-v1.c +1 -4
index 1180bef..14a3c04 100644
@@ -46,16 +46,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);
 
 static int mxc_audmux_v1_init(void)
 {
-#ifdef CONFIG_MACH_MX21
 	if (cpu_is_mx21())
 		audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
 	else
-#endif
-#ifdef CONFIG_MACH_MX27
+
 	if (cpu_is_mx27())
 		audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR);
 	else
-#endif
 		(void)0;
 	
 	return 0;
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's

Hello.

Quoted 16 lines · Fabio Estevam

As we are able to build a single kernel that can run on mx21 and mx27, there is no need for the ifdef's anymore inside audmux-v1.c.

Signed-off-by Fabio Estevam<[email protected]>

---
Changes since v1:
- Replace mx25 with mx27 in the commit message

  arch/arm/plat-mxc/audmux-v1.c |    5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)
arch/arm/plat-mxc/audmux-v1.c +0 -0
index 1180bef..14a3c04 100644
@@ -46,16 +46,13 @@ EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);

arch/arm/plat-mxc/audmux-v1.c EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port); · line 53

Quoted 10 lines
arch/arm/plat-mxc/audmux-v1.c +1 -3
  static int mxc_audmux_v1_init(void)
  {
-#ifdef CONFIG_MACH_MX21
  	if (cpu_is_mx21())
  		audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
  	else
-#endif
-#ifdef CONFIG_MACH_MX27
+
  	if (cpu_is_mx27())

Same comment about *else if*.

WBR, Sergei