Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc0b43f authored by Jason Cooper's avatar Jason Cooper
Browse files

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
parents ad9d6156 c589f9b4

arch/arm/mach-mvebu/armada-370-xp.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -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,