superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/base/node: fold unregister_node() into unregister_one_node() 

unregister_node() is only called from unregister_one_node().  This patch
folds unregister_node() into its only caller and renames
unregister_one_node() to unregister_node().

This reduces unnecessary indirection and simplifies the code structure. 
No functional changes are introduced.

[donettom@linux.ibm.com: remove extra spaces before @nid and "All"]
  Link: https://lkml.kernel.org/r/cff01514-9074-4c97-bcf1-d4e3594e48b0@linux.ibm.com
Link: https://lkml.kernel.org/r/32b7d5d8f0f30d313c3e1d8798f591459c8746f9.1760097208.git.donettom@linux.ibm.com
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: SeongJae Park <sj@kernel.org>
Cc: Aboorva Devarajan <aboorvad@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
pull/1354/merge
Donet Tom 2025-10-14 21:09:17 +05:30 committed by Andrew Morton
parent eb8762dc22
commit d945667dcb
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/base/node.c
View File

@ -676,23 +676,6 @@ static void node_device_release(struct device *dev)
kfree(to_node(dev));
}
/**
* unregister_node - unregister a node device
* @node: node going away
*
* Unregisters a node device @node. All the devices on the node must be
* unregistered before calling this function.
*/
void unregister_node(struct node *node)
{
hugetlb_unregister_node(node);
compaction_unregister_node(node);
reclaim_unregister_node(node);
node_remove_accesses(node);
node_remove_caches(node);
device_unregister(&node->dev);
}
struct node *node_devices[MAX_NUMNODES];
/*
@ -924,13 +907,26 @@ int register_node(int nid)
return error;
}
void unregister_one_node(int nid)
/**
* unregister_node - unregister a node device
* @nid: nid of the node going away
*
* Unregisters the node device at node id @nid. All the devices on the
* node must be unregistered before calling this function.
*/
void unregister_node(int nid)
{
if (!node_devices[nid])
struct node *node = node_devices[nid];
if (!node)
return;
unregister_node(node_devices[nid]);
hugetlb_unregister_node(node);
compaction_unregister_node(node);
reclaim_unregister_node(node);
node_remove_accesses(node);
node_remove_caches(node);
device_unregister(&node->dev);
node_devices[nid] = NULL;
}

6
include/linux/node.h
View File

@ -132,8 +132,6 @@ static inline void register_memory_blocks_under_nodes(void)
}
#endif
extern void unregister_node(struct node *node);
struct node_notify {
int nid;
};
@ -177,7 +175,7 @@ static inline int hotplug_node_notifier(notifier_fn_t fn, int pri)
extern void node_dev_init(void);
/* Core of the node registration - only memory hotplug should use this */
int register_node(int nid);
extern void unregister_one_node(int nid);
void unregister_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);
extern void unregister_memory_block_under_nodes(struct memory_block *mem_blk);
@ -193,7 +191,7 @@ static inline int register_node(int nid)
{
return 0;
}
static inline int unregister_one_node(int nid)
static inline int unregister_node(int nid)
{
return 0;
}

4
mm/memory_hotplug.c
View File

@ -1596,7 +1596,7 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)
error:
if (new_node) {
node_set_offline(nid);
unregister_one_node(nid);
unregister_node(nid);
}
error_memblock_remove:
if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK))
@ -2201,7 +2201,7 @@ void try_offline_node(int nid)
* node now.
*/
node_set_offline(nid);
unregister_one_node(nid);
unregister_node(nid);
}
EXPORT_SYMBOL(try_offline_node);