UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu cleanup for v3.11 (round 3) 

- mvebu
     - mark functions in armada-370-xp.c as static
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRpPQMAAoJEAi3KVZQDZAe2mMH/ivHRhYK47xruZKxSQAUemMG
 a8c9sDKSZK9m4Fca5r3dsx9VaBSLZjbkFm8iykZnukiMEl5wD9gMMinCuUxY01pv
 eY2VOC40yPD0LRQYfFi0CoUxwK2NyetGvALlt3UaBj3v8lTruEjod3JExH7Nnv3h
 DbASwUcNyK9cQAaY1CMgaZTgoXygvZ1CZqU4Vcu78uTl0ob5mK9kEXsXIBdA8Pac
 Ba6ipLNl5fjsZkAUI6KDlgu4dxbMdvi/3IU+AHVpyjqjlPrvCKVeRahdUjRwJS2s
 pToGfzr0i7t5L5JB0MYQiHvxTI6mtEyePsx2wMFUBL29DafYJDrc/3s7wiwN+m0=
 =fHxJ
 -----END PGP SIGNATURE-----

Merge tag 'tags/cleanup-3.11-3' into mvebu/regmap

mvebu cleanup for v3.11 (round 3)

 - mvebu
    - mark functions in armada-370-xp.c as static
This commit is contained in:
Jason Cooper 2013-06-13 17:47:57 +00:00
parent ad9d6156a6 c589f9b4b5
commit fdc0b43fbb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-mvebu/armada-370-xp.c
View File

@ -20,7 +20,6 @@
#include <linux/clk/mvebu.h> #include <linux/clk/mvebu.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <linux/irqchip.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
@ -38,18 +37,18 @@ static struct map_desc armada_370_xp_io_desc[] __initdata = {
}, },
}; };
void __init armada_370_xp_map_io(void) static void __init armada_370_xp_map_io(void)
{ {
iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc)); iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
} }
void __init armada_370_xp_timer_and_clk_init(void) static void __init armada_370_xp_timer_and_clk_init(void)
{ {
mvebu_clocks_init(); mvebu_clocks_init();
armada_370_xp_timer_init(); armada_370_xp_timer_init();
} }
void __init armada_370_xp_init_early(void) static void __init armada_370_xp_init_early(void)
{ {
char *mbus_soc_name; char *mbus_soc_name;
@ -89,7 +88,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.init_machine = armada_370_xp_dt_init, .init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io, .map_io = armada_370_xp_map_io,
.init_early = armada_370_xp_init_early, .init_early = armada_370_xp_init_early,
.init_irq = irqchip_init,
.init_time = armada_370_xp_timer_and_clk_init, .init_time = armada_370_xp_timer_and_clk_init,
.restart = mvebu_restart, .restart = mvebu_restart,
.dt_compat = armada_370_xp_dt_compat, .dt_compat = armada_370_xp_dt_compat,