MIPS: Remove redundant definitions of device_tree_init()

There exists many same definitions of device_tree_init() for various
platforms, add a weak function in arch/mips/kernel/prom.c to clean
up the related code.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 45d4d717e47c8e8b290b61fbfe5c05c5379d6b02..4e18cdcf65a06a4f5adac71c795ef8c55f8b4ec9 100644 (file)
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -269,8 +269,3 @@ void __init arch_init_irq(void)
 {
        irqchip_init();
 }
-
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}

diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 6abebd57b218fdb464dba385b6d0cee72307bd07..7db6ff9aed7dff9cef8c56544be894b71c307b31 100644 (file)
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -64,4 +64,9 @@ int __init __dt_register_buses(const char *bus0, const char *bus1)
        return 0;
 }
 
+void __weak __init device_tree_init(void)
+{
+       unflatten_and_copy_device_tree();
+}
+
 #endif

diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index bc9f58fcbdf9400997d192255f3089fa7f2cd24c..c731082a0c42da11e6aef7c088b17f6a43cccfa5 100644 (file)
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -84,11 +84,6 @@ void __init plat_mem_setup(void)
        __dt_setup_arch(dtb);
 }
 
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}
-
 void __init prom_init(void)
 {
        /* call the soc specific detetcion code and get it to fill soc_info */

diff --git a/arch/mips/loongson64/setup.c b/arch/mips/loongson64/setup.c
index 1973eb091e1053481a0f8eb2c878b25afef4ba85..3cd11c2b308bf93b1d2c97484010e3694bd7975c 100644 (file)
--- a/arch/mips/loongson64/setup.c
+++ b/arch/mips/loongson64/setup.c
@@ -36,8 +36,3 @@ void __init plat_mem_setup(void)
        if (loongson_fdt_blob)
                __dt_setup_arch(loongson_fdt_blob);
 }
-
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}

diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile
index 94c11f5eac7431cc5fafa7f8fcae3f2349c5dcf2..13bbd12bfa65292e7da65470a0ac9ae6a5282288 100644 (file)
--- a/arch/mips/mti-malta/Makefile
+++ b/arch/mips/mti-malta/Makefile
@@ -6,7 +6,6 @@
 # Copyright (C) 2008 Wind River Systems, Inc.
 #   written by Ralf Baechle <ralf@linux-mips.org>
 #
-obj-y                          += malta-dt.o
 obj-y                          += malta-dtshim.o
 obj-y                          += malta-init.o
 obj-y                          += malta-int.o

diff --git a/arch/mips/mti-malta/malta-dt.c b/arch/mips/mti-malta/malta-dt.c
deleted file mode 100644 (file)
index d045c91..0000000
--- a/arch/mips/mti-malta/malta-dt.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@mips.com>
- */
-
-#include <linux/clk-provider.h>
-#include <linux/init.h>
-#include <linux/of_fdt.h>
-#include <linux/of_platform.h>
-
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}

diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c
index a1860f2138dc7ac41cf558f4d0a7ef69ce29a24e..129915616763ac18e8c7e9e5c7be81061fe71439 100644 (file)
--- a/arch/mips/pic32/pic32mzda/init.c
+++ b/arch/mips/pic32/pic32mzda/init.c
@@ -78,11 +78,6 @@ void __init prom_init(void)
        pic32_init_cmdline((int)fw_arg0, (char **)fw_arg1);
 }
 
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}
-
 static struct pic32_sdhci_platform_data sdhci_data = {
        .setup_dma = pic32_set_sdhci_adma_fifo_threshold,
 };

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 35a87a2da10bc7371127661cf30cfc6510f3e03d..587c7b99876976d43c4996db81b431af1bc0d89f 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -48,11 +48,6 @@ __iomem void *plat_of_remap_node(const char *node)
        return ioremap(res.start, resource_size(&res));
 }
 
-void __init device_tree_init(void)
-{
-       unflatten_and_copy_device_tree();
-}
-
 void __init plat_mem_setup(void)
 {
        void *dtb;