Skip to contentSkip to conversation

ARM: shmobile: Remove EMEV2 header file

PATCH New Magnus Damm 2 participants 5 messages Feb 17, 2014 – Mar 7, 2014

Subsystems (4)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 1/1 ARM: shmobile: Remove EMEV2 header file

From: Magnus Damm <[email protected]>

There is no C board code left for the EMEV2 SoC, so get rid of the emev2.h include file to save some lines. While at it make functions static.

---

Written against renesas-devel-v3.14-rc3-20140217

Depends on "[PATCH v2] ARM: shmobile: Remove KZM9D board code"

 arch/arm/mach-shmobile/include/mach/emev2.h |    8 --------
 arch/arm/mach-shmobile/setup-emev2.c        |    7 ++++---
 arch/arm/mach-shmobile/smp-emev2.c          |    1 -
 3 files changed, 4 insertions(+), 12 deletions(-)
arch/arm/mach-shmobile/include/mach/emev2.h deleted +0 -8
@@ -1,8 +0,0 @@
-#ifndef __ASM_EMEV2_H__
-#define __ASM_EMEV2_H__
-
-extern void emev2_map_io(void);
-extern void emev2_init_delay(void);
-extern struct smp_operations emev2_smp_ops;
-
-#endif /* __ASM_EMEV2_H__ */
arch/arm/mach-shmobile/setup-emev2.c +4 -3
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/of_platform.h>
 #include <mach/common.h>
-#include <mach/emev2.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -38,12 +37,12 @@ static struct map_desc emev2_io_desc[] _
 #endif
 };
 
-void __init emev2_map_io(void)
+static void __init emev2_map_io(void)
 {
 	iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
 }
 
-void __init emev2_init_delay(void)
+static void __init emev2_init_delay(void)
 {
 	shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
 }
@@ -59,6 +58,8 @@ static const char *emev2_boards_compat_d
 	NULL,
 };
 
+extern struct smp_operations emev2_smp_ops;
+
 DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
 	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
arch/arm/mach-shmobile/smp-emev2.c +0 -1
@@ -24,7 +24,6 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <mach/common.h>
-#include <mach/emev2.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
#1 lore raw

PATCH 1/1 ARM: shmobile: Remove EMEV2 header file

Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

There is no C board code left for the EMEV2 SoC, so get rid of the emev2.h include file to save some lines. While at it make functions static.

Thanks, I have queued this up.

#2 lore raw

PATCH 1/1 ARM: shmobile: Remove EMEV2 header file

Quoted 10 lines · Simon Horman
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

There is no C board code left for the EMEV2 SoC, so get rid of the emev2.h include file to save some lines. While at it make functions static.

Thanks, I have queued this up.

I have changed my mind and decided to defer this patch to avoid a tedious dependency of an SoC patch on a board patch.

author maintainer
#3 lore raw

PATCH 1/1 ARM: shmobile: Remove EMEV2 header file

Quoted 8 lines · Simon Horman
Quoted 7 lines · Simon Horman
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

There is no C board code left for the EMEV2 SoC, so get rid of the emev2.h include file to save some lines. While at it make functions static.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks, I have queued this up.

I have changed my mind and decided to defer this patch to avoid a tedious dependency of an SoC patch on a board patch.

That's fine. We can handle further cleanup later. Thanks for your help!

/ magnus

#4 lore raw

PATCH 1/1 ARM: shmobile: Remove EMEV2 header file

Quoted 9 lines · Magnus Damm
Quoted 8 lines · Simon Horman
Quoted 7 lines · Simon Horman
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

There is no C board code left for the EMEV2 SoC, so get rid of the emev2.h include file to save some lines. While at it make functions static.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks, I have queued this up.

I have changed my mind and decided to defer this patch to avoid a tedious dependency of an SoC patch on a board patch.

That's fine. We can handle further cleanup later. Thanks for your help!

I have now queued it up again.