Commit a6e83ace authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer

MIPS: Remove empty prom_free_prom_memory functions

Most of the prom_free_prom_memory functions are empty. With
a new weak prom_free_prom_memory() we can remove all of them.
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent c58734ee
...@@ -143,7 +143,3 @@ int __init prom_get_ethernet_addr(char *ethernet_addr) ...@@ -143,7 +143,3 @@ int __init prom_get_ethernet_addr(char *ethernet_addr)
return 0; return 0;
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -49,8 +49,3 @@ void __init prom_meminit(void) ...@@ -49,8 +49,3 @@ void __init prom_meminit(void)
pages = memsize() >> PAGE_SHIFT; pages = memsize() >> PAGE_SHIFT;
memblock_add(PHYS_OFFSET, pages << PAGE_SHIFT); memblock_add(PHYS_OFFSET, pages << PAGE_SHIFT);
} }
void __init prom_free_prom_memory(void)
{
/* Nothing to free */
}
...@@ -20,7 +20,3 @@ ...@@ -20,7 +20,3 @@
void __init prom_init(void) void __init prom_init(void)
{ {
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -32,8 +32,3 @@ void __init prom_init(void) ...@@ -32,8 +32,3 @@ void __init prom_init(void)
} }
#endif #endif
} }
void __init prom_free_prom_memory(void)
{
/* We do not have to prom memory to free */
}
...@@ -113,10 +113,6 @@ void __init prom_init(void) ...@@ -113,10 +113,6 @@ void __init prom_init(void)
setup_8250_early_printk_port(CKSEG1ADDR(BCM47XX_SERIAL_ADDR), 0, 0); setup_8250_early_printk_port(CKSEG1ADDR(BCM47XX_SERIAL_ADDR), 0, 0);
} }
void __init prom_free_prom_memory(void)
{
}
#if defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) #if defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM)
#define EXTVBASE 0xc0000000 #define EXTVBASE 0xc0000000
......
...@@ -94,7 +94,3 @@ void __init prom_init(void) ...@@ -94,7 +94,3 @@ void __init prom_init(void)
*/ */
} }
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -129,10 +129,6 @@ void __init prom_init(void) ...@@ -129,10 +129,6 @@ void __init prom_init(void)
register_bmips_smp_ops(); register_bmips_smp_ops();
} }
void __init prom_free_prom_memory(void)
{
}
const char *get_system_type(void) const char *get_system_type(void)
{ {
return "Generic BMIPS kernel"; return "Generic BMIPS kernel";
......
...@@ -117,8 +117,3 @@ void __init prom_init(void) ...@@ -117,8 +117,3 @@ void __init prom_init(void)
setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0); setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0);
} }
void __init prom_free_prom_memory(void)
{
/* Nothing to do! */
}
...@@ -173,7 +173,7 @@ void __weak __init prom_cleanup(void) ...@@ -173,7 +173,7 @@ void __weak __init prom_cleanup(void)
{ {
} }
void __weak __init prom_free_prom_memory(void) void __init prom_free_prom_memory(void)
{ {
int i; int i;
......
...@@ -87,10 +87,6 @@ void *prom_get_hwconf(void) ...@@ -87,10 +87,6 @@ void *prom_get_hwconf(void)
return (void *)CKSEG1ADDR(hwconf); return (void *)CKSEG1ADDR(hwconf);
} }
void __init prom_free_prom_memory(void)
{
}
/* /*
* /proc/cpuinfo system type * /proc/cpuinfo system type
* *
......
...@@ -202,7 +202,3 @@ void __init arch_init_irq(void) ...@@ -202,7 +202,3 @@ void __init arch_init_irq(void)
irqchip_init(); irqchip_init();
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -44,10 +44,6 @@ int ltq_soc_type(void) ...@@ -44,10 +44,6 @@ int ltq_soc_type(void)
return soc_info.type; return soc_info.type;
} }
void __init prom_free_prom_memory(void)
{
}
static void __init prom_init_cmdline(void) static void __init prom_init_cmdline(void)
{ {
int argc = fw_arg0; int argc = fw_arg0;
......
...@@ -46,7 +46,3 @@ void __init prom_init(void) ...@@ -46,7 +46,3 @@ void __init prom_init(void)
prom_init_uart_base(); prom_init_uart_base();
board_nmi_handler_setup = mips_nmi_setup; board_nmi_handler_setup = mips_nmi_setup;
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -36,10 +36,6 @@ void __init prom_init(void) ...@@ -36,10 +36,6 @@ void __init prom_init(void)
setup_8250_early_printk_port((unsigned long)uart_base, 0, 0); setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);
} }
void __init prom_free_prom_memory(void)
{
}
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
memblock_add(0x0, (memsize << 20)); memblock_add(0x0, (memsize << 20));
......
...@@ -115,10 +115,6 @@ void __init prom_init(void) ...@@ -115,10 +115,6 @@ void __init prom_init(void)
board_nmi_handler_setup = mips_nmi_setup; board_nmi_handler_setup = mips_nmi_setup;
} }
void __init prom_free_prom_memory(void)
{
}
static int __init add_legacy_isa_io(struct fwnode_handle *fwnode, resource_size_t hw_start, static int __init add_legacy_isa_io(struct fwnode_handle *fwnode, resource_size_t hw_start,
resource_size_t size) resource_size_t size)
{ {
......
...@@ -495,6 +495,11 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end) ...@@ -495,6 +495,11 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
void (*free_init_pages_eva)(void *begin, void *end) = NULL; void (*free_init_pages_eva)(void *begin, void *end) = NULL;
void __weak __init prom_free_prom_memory(void)
{
/* nothing to do */
}
void __ref free_initmem(void) void __ref free_initmem(void)
{ {
prom_free_prom_memory(); prom_free_prom_memory();
......
...@@ -37,10 +37,6 @@ void __init fw_meminit(void) ...@@ -37,10 +37,6 @@ void __init fw_meminit(void)
free_init_pages_eva = eva ? free_init_pages_eva_malta : NULL; free_init_pages_eva = eva ? free_init_pages_eva_malta : NULL;
} }
void __init prom_free_prom_memory(void)
{
}
phys_addr_t mips_cdmm_phys_base(void) phys_addr_t mips_cdmm_phys_base(void)
{ {
/* This address is "typically unused" */ /* This address is "typically unused" */
......
...@@ -130,11 +130,6 @@ const char *get_system_type(void) ...@@ -130,11 +130,6 @@ const char *get_system_type(void)
} }
} }
void __init prom_free_prom_memory(void)
{
/* Nothing yet */
}
void xlp_mmu_init(void) void xlp_mmu_init(void)
{ {
u32 conf4; u32 conf4;
......
...@@ -89,11 +89,6 @@ unsigned int nlm_get_cpu_frequency(void) ...@@ -89,11 +89,6 @@ unsigned int nlm_get_cpu_frequency(void)
return (unsigned int)nlm_prom_info.cpu_frequency; return (unsigned int)nlm_prom_info.cpu_frequency;
} }
void __init prom_free_prom_memory(void)
{
/* Nothing yet */
}
void nlm_percpu_init(int hwcpuid) void nlm_percpu_init(int hwcpuid)
{ {
if (hwcpuid % 4 == 0) if (hwcpuid % 4 == 0)
......
...@@ -91,10 +91,6 @@ void __init prom_init(void) ...@@ -91,10 +91,6 @@ void __init prom_init(void)
pic32_init_cmdline((int)fw_arg0, (char **)fw_arg1); pic32_init_cmdline((int)fw_arg0, (char **)fw_arg1);
} }
void __init prom_free_prom_memory(void)
{
}
void __init device_tree_init(void) void __init device_tree_init(void)
{ {
if (!initial_boot_params) if (!initial_boot_params)
......
...@@ -118,10 +118,6 @@ void __init prom_init(void) ...@@ -118,10 +118,6 @@ void __init prom_init(void)
pr_info("SoC Type: %s\n", get_system_type()); pr_info("SoC Type: %s\n", get_system_type());
} }
void __init prom_free_prom_memory(void)
{
}
void __init device_tree_init(void) void __init device_tree_init(void)
{ {
if (!initial_boot_params) if (!initial_boot_params)
......
...@@ -66,7 +66,3 @@ void __init prom_init(void) ...@@ -66,7 +66,3 @@ void __init prom_init(void)
prom_init_cmdline(); prom_init_cmdline();
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -34,11 +34,6 @@ static struct resource ddr_reg[] = { ...@@ -34,11 +34,6 @@ static struct resource ddr_reg[] = {
} }
}; };
void __init prom_free_prom_memory(void)
{
/* No prom memory to free */
}
static inline int match_tag(char *arg, const char *tag) static inline int match_tag(char *arg, const char *tag)
{ {
return strncmp(arg, tag, strlen(tag)) == 0; return strncmp(arg, tag, strlen(tag)) == 0;
......
...@@ -404,11 +404,6 @@ void __init prom_meminit(void) ...@@ -404,11 +404,6 @@ void __init prom_meminit(void)
} }
} }
void __init prom_free_prom_memory(void)
{
/* We got nothing to free here ... */
}
extern void setup_zero_pages(void); extern void setup_zero_pages(void);
void __init paging_init(void) void __init paging_init(void)
......
...@@ -40,8 +40,3 @@ void __init prom_meminit(void) ...@@ -40,8 +40,3 @@ void __init prom_meminit(void)
memblock_add(base, size); memblock_add(base, size);
} }
} }
void __init prom_free_prom_memory(void)
{
}
...@@ -316,11 +316,6 @@ void __init prom_init(void) ...@@ -316,11 +316,6 @@ void __init prom_init(void)
#endif #endif
} }
void __init prom_free_prom_memory(void)
{
/* Not sure what I'm supposed to do here. Nothing, I think */
}
void prom_putchar(char c) void prom_putchar(char c)
{ {
int ret; int ret;
......
...@@ -340,10 +340,6 @@ void __init prom_init(void) ...@@ -340,10 +340,6 @@ void __init prom_init(void)
txx9_board_vec->prom_init(); txx9_board_vec->prom_init();
} }
void __init prom_free_prom_memory(void)
{
}
const char *get_system_type(void) const char *get_system_type(void)
{ {
return txx9_system_type; return txx9_system_type;
......
...@@ -58,7 +58,3 @@ void __init prom_init(void) ...@@ -58,7 +58,3 @@ void __init prom_init(void)
strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
} }
} }
void __init prom_free_prom_memory(void)
{
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment