Commit a5352f8a authored by Donet Tom's avatar Donet Tom Committed by Andrew Morton
Browse files

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: default avatarDonet Tom <donettom@linux.ibm.com>
Acked-by: default avatarDavid 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 10f09d82

arch/powerpc/platforms/pseries/pci_dlpar.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/base/node.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

include/linux/node.h

+1 −12
Original line number Diff line number Diff line
@@ -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;

mm/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}