of: Move of_platform_register_reconfig_notifier() into DT core

There's no reason the generic platform bus code needs to call
of_platform_register_reconfig_notifier(). The notifier can be setup
before the platform bus is. Let's move it into of_core_init() which is
called just before platform_bus_init() instead to keep more of the DT
bits in the DT code.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230717143718.1715773-1-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 77510e4f47de87ff43271fb29fdf82ee9311ad12..76bfcba250039f631e0fa53a2f67d00157383ee3 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1528,6 +1528,6 @@ int __init platform_bus_init(void)
        error =  bus_register(&platform_bus_type);
        if (error)
                device_unregister(&platform_bus);
-       of_platform_register_reconfig_notifier();
+
        return error;
 }

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 166fb7d7533784584cd9a630d3886be1f17ce7d1..e235f3a57ea899c28b08544d90dae64d258a46cd 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -167,6 +167,7 @@ void __init of_core_init(void)
 {
        struct device_node *np;
 
+       of_platform_register_reconfig_notifier();
 
        /* Create the kset, and register existing nodes */
        mutex_lock(&of_mutex);

diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index b57f1014e419c49b21c0d4be72ad73d360675909..f38397c7b58241799bfd8e8d4395180bf88b118e 100644 (file)
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -60,6 +60,12 @@ static inline int of_property_notify(int action, struct device_node *np,
 }
 #endif /* CONFIG_OF_DYNAMIC */
 
+#if defined(CONFIG_OF_DYNAMIC) && defined(CONFIG_OF_ADDRESS)
+void of_platform_register_reconfig_notifier(void);
+#else
+static inline void of_platform_register_reconfig_notifier(void) { }
+#endif
+
 #if defined(CONFIG_OF_KOBJ)
 int of_node_is_attached(const struct device_node *node);
 int __of_add_property_sysfs(struct device_node *np, struct property *pp);

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 051e29b7ad2b83ad461119016714c80ed402a0f9..e71adb394b417f30d144021fd24b88591d3062a8 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -21,6 +21,8 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
+#include "of_private.h"
+
 const struct of_device_id of_default_bus_match_table[] = {
        { .compatible = "simple-bus", },
        { .compatible = "simple-mfd", },

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index d8045bcfc35edecc357f64bd63260ded42e22b5a..fadfea5754852df256da1f77461f1d119a3bf418 100644 (file)
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -127,10 +127,4 @@ static inline int devm_of_platform_populate(struct device *dev)
 static inline void devm_of_platform_depopulate(struct device *dev) { }
 #endif
 
-#if defined(CONFIG_OF_DYNAMIC) && defined(CONFIG_OF_ADDRESS)
-extern void of_platform_register_reconfig_notifier(void);
-#else
-static inline void of_platform_register_reconfig_notifier(void) { }
-#endif
-
 #endif /* _LINUX_OF_PLATFORM_H */