drivers/base/node: rename __register_one_node() to register_one_node()

The register_one_node() function was a simple wrapper around
__register_one_node().  To simplify the code, register_one_node() has been
removed, and __register_one_node() has been renamed to
register_one_node().

Link: https://lkml.kernel.org/r/8262cd0f44eeb048a1fcd3ac8382760d7f7dea60.1748452242.git.donettom@linux.ibm.com
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 52e2623a741dede7228cf7ebaf281b25b3e73833..aeb8633a3d00fa17426a62e65bde59d9fba17335 100644 (file)
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -29,7 +29,7 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn)
        nid = of_node_to_nid(dn);
        if (likely((nid) >= 0)) {
                if (!node_online(nid)) {
-                       if (__register_one_node(nid)) {
+                       if (register_one_node(nid)) {
                                pr_err("PCI: Failed to register node %d\n", nid);
                        } else {
                                update_numa_distance(dn);

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 302cb99853ddf72e33f0497b011e293ad832c14d..6cbeca45c451f76d900c53e7e17d62c4ad6e6689 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -848,7 +848,7 @@ void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn,
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-int __register_one_node(int nid)
+int register_one_node(int nid)
 {
        int error;
        int cpu;
@@ -955,7 +955,7 @@ void __init node_dev_init(void)
         * to already created cpu devices.
         */
        for_each_online_node(i) {
-               ret =  __register_one_node(i);
+               ret =  register_one_node(i);
                if (ret)
                        panic("%s() failed to add node: %d\n", __func__, ret);
        }

diff --git a/include/linux/node.h b/include/linux/node.h
index 75b036a100d2c6a986076111c11c1ae41b553a44..88bceebcbfa54e33ad1067e1213d5d32ed227f0d 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -128,14 +128,7 @@ extern void unregister_node(struct node *node);
 #ifdef CONFIG_NUMA
 extern void node_dev_init(void);
 /* Core of the node registration - only memory hotplug should use this */
-extern int __register_one_node(int nid);
-
-/* Registers an online node */
-static inline int register_one_node(int nid)
-{
-       return __register_one_node(nid);
-}
-
+extern int register_one_node(int nid);
 extern void unregister_one_node(int nid);
 extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
 extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
@@ -148,10 +141,6 @@ extern int register_memory_node_under_compute_node(unsigned int mem_nid,
 static inline void node_dev_init(void)
 {
 }
-static inline int __register_one_node(int nid)
-{
-       return 0;
-}
 static inline int register_one_node(int nid)
 {
        return 0;

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index c6ce1aba64e6c1abe10b1b8bb4a8e9a555b2bb65..bec20a91e7575c6e7bac6776857232425dabe76a 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1571,7 +1571,7 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)
                 * We online node here. We can't roll back from here.
                 */
                node_set_online(nid);
-               ret = __register_one_node(nid);
+               ret = register_one_node(nid);
                BUG_ON(ret);
        }