of: Hide of_default_bus_match_table[]

This isn't used outside this file. Hide the array in the C file.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Acked-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20241204194806.2665589-1-swboyd@chromium.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9bafcff3e628cb8a5b3b9af963ba55d5403d12fe..c6d8afb284e88061eb6fb0ba02e429cec702664c 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -24,16 +24,6 @@
 
 #include "of_private.h"
 
-const struct of_device_id of_default_bus_match_table[] = {
-       { .compatible = "simple-bus", },
-       { .compatible = "simple-mfd", },
-       { .compatible = "isa", },
-#ifdef CONFIG_ARM_AMBA
-       { .compatible = "arm,amba-bus", },
-#endif /* CONFIG_ARM_AMBA */
-       {} /* Empty terminated list */
-};
-
 /**
  * of_find_device_by_node - Find the platform_device associated with a node
  * @np: Pointer to device tree node
@@ -484,8 +474,17 @@ int of_platform_default_populate(struct device_node *root,
                                 const struct of_dev_auxdata *lookup,
                                 struct device *parent)
 {
-       return of_platform_populate(root, of_default_bus_match_table, lookup,
-                                   parent);
+       static const struct of_device_id match_table[] = {
+               { .compatible = "simple-bus", },
+               { .compatible = "simple-mfd", },
+               { .compatible = "isa", },
+#ifdef CONFIG_ARM_AMBA
+               { .compatible = "arm,amba-bus", },
+#endif /* CONFIG_ARM_AMBA */
+               {} /* Empty terminated list */
+       };
+
+       return of_platform_populate(root, match_table, lookup, parent);
 }
 EXPORT_SYMBOL_GPL(of_platform_default_populate);
 

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index a2ff1ad48f7f0c19f1e3403a9d2deb8ac860cb85..17471ef8e092a5dc8f654a9cecd781c0d16e040d 100644 (file)
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -47,8 +47,6 @@ struct of_dev_auxdata {
        { .compatible = _compat, .phys_addr = _phys, .name = _name, \
          .platform_data = _pdata }
 
-extern const struct of_device_id of_default_bus_match_table[];
-
 /* Platform drivers register/unregister */
 extern struct platform_device *of_device_alloc(struct device_node *np,
                                         const char *bus_id,