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>

diff --git a/arch/mips/alchemy/common/prom.c b/arch/mips/alchemy/common/prom.c
index d910c0a64de95bfd85137682a98cc8b48bd458df..b13d8adf3be47dbfd6f65e1e63ee3217feafe04b 100644 (file)
--- a/arch/mips/alchemy/common/prom.c
+++ b/arch/mips/alchemy/common/prom.c
@@ -143,7 +143,3 @@ int __init prom_get_ethernet_addr(char *ethernet_addr)
 
        return 0;
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c
index 787716c5e946bc79a7590c309fd56c99ebfdbbaf..ce8024c1a54e1448aab41f052d46a2e78afffd3e 100644 (file)
--- a/arch/mips/ar7/memory.c
+++ b/arch/mips/ar7/memory.c
@@ -49,8 +49,3 @@ void __init prom_meminit(void)
        pages = memsize() >> PAGE_SHIFT;
        memblock_add(PHYS_OFFSET, pages << PAGE_SHIFT);
 }
-
-void __init prom_free_prom_memory(void)
-{
-       /* Nothing to free */
-}

diff --git a/arch/mips/ath25/prom.c b/arch/mips/ath25/prom.c
index edf82be8870d586635f2e0a353a6f63b112eb7f1..4466e14feaa4c573f713959fc395dc771c90af2b 100644 (file)
--- a/arch/mips/ath25/prom.c
+++ b/arch/mips/ath25/prom.c
@@ -20,7 +20,3 @@
 void __init prom_init(void)
 {
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
index 25724b4e97fd7dfea3d3654cac387131ea9569cb..cc6dc56006775420452eb57c99d660f9872ece62 100644 (file)
--- a/arch/mips/ath79/prom.c
+++ b/arch/mips/ath79/prom.c
@@ -32,8 +32,3 @@ void __init prom_init(void)
        }
 #endif
 }
-
-void __init prom_free_prom_memory(void)
-{
-       /* We do not have to prom memory to free */
-}

diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 3e2a8166377f5fd851d08b73c2835805096a9b99..0a63721d0fbf34db85cc21ca213dd35edc264465 100644 (file)
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -113,10 +113,6 @@ void __init prom_init(void)
        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)
 
 #define EXTVBASE       0xc0000000

diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index df69eaa453a1c299b8467c3b972ef8a225fc5706..c3a2ea62c5c301b67ac8742af8ad968abecdfdf9 100644 (file)
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -94,7 +94,3 @@ void __init prom_init(void)
                 */
        }
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index 1b06b25aea87dd1b4b67d4764bff878952aed794..10e31d91ca8fca88543683efdc9d91f28e85b45d 100644 (file)
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -129,10 +129,6 @@ void __init prom_init(void)
        register_bmips_smp_ops();
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 const char *get_system_type(void)
 {
        return "Generic BMIPS kernel";

diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 46581e68688259307fcd8f87b516ba727692a499..2e099d55a564a6ecf3dc347ace84ad25e4278dd9 100644 (file)
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -117,8 +117,3 @@ void __init prom_init(void)
 
        setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0);
 }
-
-void __init prom_free_prom_memory(void)
-{
-       /* Nothing to do! */
-}

diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c
index 37625ae5e35d53ff435d604695894ba7131def61..ef5fc1ca1b5d4874d3ed976db698e4f484ebd088 100644 (file)
--- a/arch/mips/fw/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -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;
 

diff --git a/arch/mips/fw/sni/sniprom.c b/arch/mips/fw/sni/sniprom.c
index 8f6730376a427a8a721d9df6e5bc9df965704520..74975e115950bda2f3d3da9eb4c224df24748cc7 100644 (file)
--- a/arch/mips/fw/sni/sniprom.c
+++ b/arch/mips/fw/sni/sniprom.c
@@ -87,10 +87,6 @@ void *prom_get_hwconf(void)
        return (void *)CKSEG1ADDR(hwconf);
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 /*
  * /proc/cpuinfo system type
  *

diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
index 66a19337d2abf1c69dced4f3042f5712eeb46aee..68763fcde1d05e28193e2e058db07478dfe07827 100644 (file)
--- a/arch/mips/generic/init.c
+++ b/arch/mips/generic/init.c
@@ -202,7 +202,3 @@ void __init arch_init_irq(void)
 
        irqchip_init();
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 3f568f5aae2d1121ee684b1b53fe257b17ba511f..36393712161760d61212a6c38850cce764109479 100644 (file)
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -44,10 +44,6 @@ int ltq_soc_type(void)
        return soc_info.type;
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 static void __init prom_init_cmdline(void)
 {
        int argc = fw_arg0;

diff --git a/arch/mips/loongson2ef/common/init.c b/arch/mips/loongson2ef/common/init.c
index ce3f02f75e2a8ece3ffc6da98fb88e22eedf4bfb..088aa56d4ed152f355608db8ad675d11820c05bd 100644 (file)
--- a/arch/mips/loongson2ef/common/init.c
+++ b/arch/mips/loongson2ef/common/init.c
@@ -46,7 +46,3 @@ void __init prom_init(void)
        prom_init_uart_base();
        board_nmi_handler_setup = mips_nmi_setup;
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/loongson32/common/prom.c b/arch/mips/loongson32/common/prom.c
index c133b5adf34e76d40a17485f4a87d032b6d71e5d..fc580a22748e12417212f6a3505cf485ac7e0f73 100644 (file)
--- a/arch/mips/loongson32/common/prom.c
+++ b/arch/mips/loongson32/common/prom.c
@@ -36,10 +36,6 @@ void __init prom_init(void)
        setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 void __init plat_mem_setup(void)
 {
        memblock_add(0x0, (memsize << 20));

diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c
index e13f704bef80d2cb8d6fe0810e4e480c88d1ea1f..87a4569972aeb19a427cf22c62d533231d3c7b64 100644 (file)
--- a/arch/mips/loongson64/init.c
+++ b/arch/mips/loongson64/init.c
@@ -115,10 +115,6 @@ void __init prom_init(void)
        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,
                                    resource_size_t size)
 {

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index bc80893e5c0f8f77f3ce55212d7c5fde33ebce65..5cb73bf74a8b6cd2327239ca047aab467d717137 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -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 __weak __init prom_free_prom_memory(void)
+{
+       /* nothing to do */
+}
+
 void __ref free_initmem(void)
 {
        prom_free_prom_memory();

diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index 7c25a0a2345cd7e7a351e0726f5e132e33470495..952018812885f6b62e0ee6f2dba3e66a330d1f4d 100644 (file)
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -37,10 +37,6 @@ void __init fw_meminit(void)
        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)
 {
        /* This address is "typically unused" */

diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 9adc0c1b4ffcd9fa6cf83dcfa1355960bad0b5a2..9fbaa1e5b3407059b57e605eb7f38a99a468f453 100644 (file)
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -130,11 +130,6 @@ const char *get_system_type(void)
        }
 }
 
-void __init prom_free_prom_memory(void)
-{
-       /* Nothing yet */
-}
-
 void xlp_mmu_init(void)
 {
        u32 conf4;

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index 627e88101316f53b7a045e3043c378fc4080354c..aa83d691df0f2adbbb0d706813f05c8c8e3ddb0c 100644 (file)
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -89,11 +89,6 @@ unsigned int nlm_get_cpu_frequency(void)
        return (unsigned int)nlm_prom_info.cpu_frequency;
 }
 
-void __init prom_free_prom_memory(void)
-{
-       /* Nothing yet */
-}
-
 void nlm_percpu_init(int hwcpuid)
 {
        if (hwcpuid % 4 == 0)

diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c
index f232c77ff5265381908eef747eacca2f4316b4be..1897aa86357304d13eaef89e008609a0ddac78d7 100644 (file)
--- a/arch/mips/pic32/pic32mzda/init.c
+++ b/arch/mips/pic32/pic32mzda/init.c
@@ -91,10 +91,6 @@ void __init prom_init(void)
        pic32_init_cmdline((int)fw_arg0, (char **)fw_arg1);
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 void __init device_tree_init(void)
 {
        if (!initial_boot_params)

diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
index 558995ed6fe8867601d81c3b5358baa2a47e7399..ddc0e84c13f5e0f3c6cdbe341baf04fa45aaf3b5 100644 (file)
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
@@ -118,10 +118,6 @@ void __init prom_init(void)
        pr_info("SoC Type: %s\n", get_system_type());
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 void __init device_tree_init(void)
 {
        if (!initial_boot_params)

diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c
index 02e7878dc427c7d47d28712b75274fe129a45131..25728def3503b10fccfcd25cd4e5a24608dc95d2 100644 (file)
--- a/arch/mips/ralink/prom.c
+++ b/arch/mips/ralink/prom.c
@@ -66,7 +66,3 @@ void __init prom_init(void)
 
        prom_init_cmdline();
 }
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index a9d1f2019dc3a84bf685515192459f36ecd1d611..23ad8dd9aa5e03b6d90718b0db3a0366e9bbf93d 100644 (file)
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -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)
 {
        return strncmp(arg, tag, strlen(tag)) == 0;

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index d411e0a90a5bea01069c796755bc1f607821e1e0..87bb6945ec25dcf9419a6b282123437d87a722f4 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -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);
 
 void __init paging_init(void)

diff --git a/arch/mips/sgi-ip32/ip32-memory.c b/arch/mips/sgi-ip32/ip32-memory.c
index 0f53fed39da6da0121452f594de8cd67a7be0acc..3fc8d0a0bdfa45cc8b3aead0bd31144a874e17bb 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-memory.c
+++ b/arch/mips/sgi-ip32/ip32-memory.c
@@ -40,8 +40,3 @@ void __init prom_meminit(void)
                memblock_add(base, size);
        }
 }
-
-
-void __init prom_free_prom_memory(void)
-{
-}

diff --git a/arch/mips/sibyte/common/cfe.c b/arch/mips/sibyte/common/cfe.c
index 89f7fca45152cf83777cf0b58ef735b0e1907e6e..a3323f8dcc1b85a6e738de6c97758e22f034c1d1 100644 (file)
--- a/arch/mips/sibyte/common/cfe.c
+++ b/arch/mips/sibyte/common/cfe.c
@@ -316,11 +316,6 @@ void __init prom_init(void)
 #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)
 {
        int ret;

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 6d0fd0e055b4ba4a723f8bf82a656256fdfa481d..42ba1e97dff0ff2d22aa956eaec463552a58eded 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -340,10 +340,6 @@ void __init prom_init(void)
        txx9_board_vec->prom_init();
 }
 
-void __init prom_free_prom_memory(void)
-{
-}
-
 const char *get_system_type(void)
 {
        return txx9_system_type;

diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index ca53ac3060efbf152b9c932214330ab6298b3a8c..628dddf79a05a9af4b4b33310cc52377eb582821 100644 (file)
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -58,7 +58,3 @@ void __init prom_init(void)
                        strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
        }
 }
-
-void __init prom_free_prom_memory(void)
-{
-}