tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'cleanup-3.11-3' of git://git.infradead.org/users/jcooper/linux into next/cleanup
From Jason Cooper, mvebu cleanup for v3.11.
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'cleanup-3.11-3' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: mark functions of armada-370-xp.c as static
ARM: mvebu: Remove init_irq declaration in machine description
ARM: Orion: Remove redundant init_dma_coherent_pool_size()
+3
-5
+3
-5
arch/arm/mach-mvebu/armada-370-xp.c
+3
-5
arch/arm/mach-mvebu/armada-370-xp.c
···
20
20
#include <linux/clk/mvebu.h>
21
21
#include <linux/dma-mapping.h>
22
22
#include <linux/mbus.h>
23
-
#include <linux/irqchip.h>
24
23
#include <asm/hardware/cache-l2x0.h>
25
24
#include <asm/mach/arch.h>
26
25
#include <asm/mach/map.h>
···
37
38
},
38
39
};
39
40
40
-
void __init armada_370_xp_map_io(void)
41
+
static void __init armada_370_xp_map_io(void)
41
42
{
42
43
iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
43
44
}
44
45
45
-
void __init armada_370_xp_timer_and_clk_init(void)
46
+
static void __init armada_370_xp_timer_and_clk_init(void)
46
47
{
47
48
mvebu_clocks_init();
48
49
armada_370_xp_timer_init();
49
50
}
50
51
51
-
void __init armada_370_xp_init_early(void)
52
+
static void __init armada_370_xp_init_early(void)
52
53
{
53
54
char *mbus_soc_name;
54
55
···
88
89
.init_machine = armada_370_xp_dt_init,
89
90
.map_io = armada_370_xp_map_io,
90
91
.init_early = armada_370_xp_init_early,
91
-
.init_irq = irqchip_init,
92
92
.init_time = armada_370_xp_timer_and_clk_init,
93
93
.restart = mvebu_restart,
94
94
.dt_compat = armada_370_xp_dt_compat,