Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>

+6 -114
-4
arch/mips/alchemy/common/prom.c
··· 143 143 144 144 return 0; 145 145 } 146 - 147 - void __init prom_free_prom_memory(void) 148 - { 149 - }
-5
arch/mips/ar7/memory.c
··· 49 49 pages = memsize() >> PAGE_SHIFT; 50 50 memblock_add(PHYS_OFFSET, pages << PAGE_SHIFT); 51 51 } 52 - 53 - void __init prom_free_prom_memory(void) 54 - { 55 - /* Nothing to free */ 56 - }
-4
arch/mips/ath25/prom.c
··· 20 20 void __init prom_init(void) 21 21 { 22 22 } 23 - 24 - void __init prom_free_prom_memory(void) 25 - { 26 - }
-5
arch/mips/ath79/prom.c
··· 32 32 } 33 33 #endif 34 34 } 35 - 36 - void __init prom_free_prom_memory(void) 37 - { 38 - /* We do not have to prom memory to free */ 39 - }
-4
arch/mips/bcm47xx/prom.c
··· 113 113 setup_8250_early_printk_port(CKSEG1ADDR(BCM47XX_SERIAL_ADDR), 0, 0); 114 114 } 115 115 116 - void __init prom_free_prom_memory(void) 117 - { 118 - } 119 - 120 116 #if defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) 121 117 122 118 #define EXTVBASE 0xc0000000
-4
arch/mips/bcm63xx/prom.c
··· 94 94 */ 95 95 } 96 96 } 97 - 98 - void __init prom_free_prom_memory(void) 99 - { 100 - }
-4
arch/mips/bmips/setup.c
··· 129 129 register_bmips_smp_ops(); 130 130 } 131 131 132 - void __init prom_free_prom_memory(void) 133 - { 134 - } 135 - 136 132 const char *get_system_type(void) 137 133 { 138 134 return "Generic BMIPS kernel";
-5
arch/mips/cobalt/setup.c
··· 117 117 118 118 setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0); 119 119 } 120 - 121 - void __init prom_free_prom_memory(void) 122 - { 123 - /* Nothing to do! */ 124 - }
+1 -1
arch/mips/fw/arc/memory.c
··· 173 173 { 174 174 } 175 175 176 - void __weak __init prom_free_prom_memory(void) 176 + void __init prom_free_prom_memory(void) 177 177 { 178 178 int i; 179 179
-4
arch/mips/fw/sni/sniprom.c
··· 87 87 return (void *)CKSEG1ADDR(hwconf); 88 88 } 89 89 90 - void __init prom_free_prom_memory(void) 91 - { 92 - } 93 - 94 90 /* 95 91 * /proc/cpuinfo system type 96 92 *
-4
arch/mips/generic/init.c
··· 202 202 203 203 irqchip_init(); 204 204 } 205 - 206 - void __init prom_free_prom_memory(void) 207 - { 208 - }
-4
arch/mips/lantiq/prom.c
··· 44 44 return soc_info.type; 45 45 } 46 46 47 - void __init prom_free_prom_memory(void) 48 - { 49 - } 50 - 51 47 static void __init prom_init_cmdline(void) 52 48 { 53 49 int argc = fw_arg0;
-4
arch/mips/loongson2ef/common/init.c
··· 46 46 prom_init_uart_base(); 47 47 board_nmi_handler_setup = mips_nmi_setup; 48 48 } 49 - 50 - void __init prom_free_prom_memory(void) 51 - { 52 - }
-4
arch/mips/loongson32/common/prom.c
··· 36 36 setup_8250_early_printk_port((unsigned long)uart_base, 0, 0); 37 37 } 38 38 39 - void __init prom_free_prom_memory(void) 40 - { 41 - } 42 - 43 39 void __init plat_mem_setup(void) 44 40 { 45 41 memblock_add(0x0, (memsize << 20));
-4
arch/mips/loongson64/init.c
··· 115 115 board_nmi_handler_setup = mips_nmi_setup; 116 116 } 117 117 118 - void __init prom_free_prom_memory(void) 119 - { 120 - } 121 - 122 118 static int __init add_legacy_isa_io(struct fwnode_handle *fwnode, resource_size_t hw_start, 123 119 resource_size_t size) 124 120 {
+5
arch/mips/mm/init.c
··· 495 495 496 496 void (*free_init_pages_eva)(void *begin, void *end) = NULL; 497 497 498 + void __weak __init prom_free_prom_memory(void) 499 + { 500 + /* nothing to do */ 501 + } 502 + 498 503 void __ref free_initmem(void) 499 504 { 500 505 prom_free_prom_memory();
-4
arch/mips/mti-malta/malta-memory.c
··· 37 37 free_init_pages_eva = eva ? free_init_pages_eva_malta : NULL; 38 38 } 39 39 40 - void __init prom_free_prom_memory(void) 41 - { 42 - } 43 - 44 40 phys_addr_t mips_cdmm_phys_base(void) 45 41 { 46 42 /* This address is "typically unused" */
-5
arch/mips/netlogic/xlp/setup.c
··· 130 130 } 131 131 } 132 132 133 - void __init prom_free_prom_memory(void) 134 - { 135 - /* Nothing yet */ 136 - } 137 - 138 133 void xlp_mmu_init(void) 139 134 { 140 135 u32 conf4;
-5
arch/mips/netlogic/xlr/setup.c
··· 89 89 return (unsigned int)nlm_prom_info.cpu_frequency; 90 90 } 91 91 92 - void __init prom_free_prom_memory(void) 93 - { 94 - /* Nothing yet */ 95 - } 96 - 97 92 void nlm_percpu_init(int hwcpuid) 98 93 { 99 94 if (hwcpuid % 4 == 0)
-4
arch/mips/pic32/pic32mzda/init.c
··· 91 91 pic32_init_cmdline((int)fw_arg0, (char **)fw_arg1); 92 92 } 93 93 94 - void __init prom_free_prom_memory(void) 95 - { 96 - } 97 - 98 94 void __init device_tree_init(void) 99 95 { 100 96 if (!initial_boot_params)
-4
arch/mips/pistachio/init.c
··· 118 118 pr_info("SoC Type: %s\n", get_system_type()); 119 119 } 120 120 121 - void __init prom_free_prom_memory(void) 122 - { 123 - } 124 - 125 121 void __init device_tree_init(void) 126 122 { 127 123 if (!initial_boot_params)
-4
arch/mips/ralink/prom.c
··· 66 66 67 67 prom_init_cmdline(); 68 68 } 69 - 70 - void __init prom_free_prom_memory(void) 71 - { 72 - }
-5
arch/mips/rb532/prom.c
··· 34 34 } 35 35 }; 36 36 37 - void __init prom_free_prom_memory(void) 38 - { 39 - /* No prom memory to free */ 40 - } 41 - 42 37 static inline int match_tag(char *arg, const char *tag) 43 38 { 44 39 return strncmp(arg, tag, strlen(tag)) == 0;
-5
arch/mips/sgi-ip27/ip27-memory.c
··· 404 404 } 405 405 } 406 406 407 - void __init prom_free_prom_memory(void) 408 - { 409 - /* We got nothing to free here ... */ 410 - } 411 - 412 407 extern void setup_zero_pages(void); 413 408 414 409 void __init paging_init(void)
-5
arch/mips/sgi-ip32/ip32-memory.c
··· 40 40 memblock_add(base, size); 41 41 } 42 42 } 43 - 44 - 45 - void __init prom_free_prom_memory(void) 46 - { 47 - }
-5
arch/mips/sibyte/common/cfe.c
··· 316 316 #endif 317 317 } 318 318 319 - void __init prom_free_prom_memory(void) 320 - { 321 - /* Not sure what I'm supposed to do here. Nothing, I think */ 322 - } 323 - 324 319 void prom_putchar(char c) 325 320 { 326 321 int ret;
-4
arch/mips/txx9/generic/setup.c
··· 340 340 txx9_board_vec->prom_init(); 341 341 } 342 342 343 - void __init prom_free_prom_memory(void) 344 - { 345 - } 346 - 347 343 const char *get_system_type(void) 348 344 { 349 345 return txx9_system_type;
-4
arch/mips/vr41xx/common/init.c
··· 58 58 strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); 59 59 } 60 60 } 61 - 62 - void __init prom_free_prom_memory(void) 63 - { 64 - }