From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) Date: Tue, 12 Feb 2013 17:28:52 +0100 Subject: [PATCH 18/32] arm: plat-orion: remove __init from addr-map functions needed after boot time In-Reply-To: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <1360686546-24277-19-git-send-email-thomas.petazzoni@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The I/O and memory windows of PCIe interfaces will now be configurable dynamically, while the system runs, so we need to keep some the plat-orion/addr-map.c functions around even after the system initialization has completed. Signed-off-by: Thomas Petazzoni --- arch/arm/plat-orion/addr-map.c | 18 +++++++++--------- arch/arm/plat-orion/include/plat/addr-map.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c index b1d4806..a187524 100644 --- a/arch/arm/plat-orion/addr-map.c +++ b/arch/arm/plat-orion/addr-map.c @@ -48,7 +48,7 @@ EXPORT_SYMBOL_GPL(mv_mbus_dram_info); /* * Default implementation */ -static void __init __iomem * +static void __iomem * orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) { return cfg->bridge_virt_base + (win << 4); @@ -57,8 +57,8 @@ orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) /* * Default implementation */ -static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, - const int win) +static int orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, + const int win) { if (win < cfg->remappable_wins) return 1; @@ -66,10 +66,10 @@ static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, return 0; } -void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win, const u32 base, - const u32 size, const u8 target, - const u8 attr, const u32 remap) +void orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win, const u32 base, + const u32 size, const u8 target, + const u8 attr, const u32 remap) { void __iomem *addr = cfg->win_cfg_base(cfg, win); u32 ctrl, base_high, remap_addr; @@ -95,8 +95,8 @@ void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, } } -static void __init orion_disable_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win) +static void orion_disable_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win) { void __iomem *addr = cfg->win_cfg_base(cfg, win); diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h index 6533c47..a5b21a9 100644 --- a/arch/arm/plat-orion/include/plat/addr-map.h +++ b/arch/arm/plat-orion/include/plat/addr-map.h @@ -46,10 +46,10 @@ struct orion_addr_map_info { void __init orion_config_wins(struct orion_addr_map_cfg *cfg, const struct orion_addr_map_info *info); -void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, - const int win, const u32 base, - const u32 size, const u8 target, - const u8 attr, const u32 remap); +void orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, + const int win, const u32 base, + const u32 size, const u8 target, + const u8 attr, const u32 remap); void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg, const void __iomem *ddr_window_cpu_base); -- 1.7.9.5