Skip to content

Commit ba424bc

Browse files
author
Danilo Krummrich
committed
devres: rename and export set_node_dbginfo()
Rename set_node_dbginfo() to devres_set_node_dbginfo() and export it through base.h, such that we can access is from the Rust devres code. Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://patch.msgid.link/20260213220718.82835-5-dakr@kernel.org Signed-off-by: Danilo Krummrich <dakr@kernel.org>
1 parent b1081ef commit ba424bc

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

drivers/base/base.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ void devres_node_init(struct devres_node *node, dr_node_release_t release,
232232
dr_node_free_t free_node);
233233
void devres_node_add(struct device *dev, struct devres_node *node);
234234
bool devres_node_remove(struct device *dev, struct devres_node *node);
235+
void devres_set_node_dbginfo(struct devres_node *node, const char *name,
236+
size_t size);
235237
void devres_for_each_res(struct device *dev, dr_release_t release,
236238
dr_match_t match, void *match_data,
237239
void (*fn)(struct device *, void *, void *),

drivers/base/devres.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static inline void free_node(struct devres_node *node)
5050
node->free_node(node);
5151
}
5252

53-
static void set_node_dbginfo(struct devres_node *node, const char *name,
53+
void devres_set_node_dbginfo(struct devres_node *node, const char *name,
5454
size_t size)
5555
{
5656
node->name = name;
@@ -189,7 +189,7 @@ void *__devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid,
189189
dr = alloc_dr(release, size, gfp | __GFP_ZERO, nid);
190190
if (unlikely(!dr))
191191
return NULL;
192-
set_node_dbginfo(&dr->node, name, size);
192+
devres_set_node_dbginfo(&dr->node, name, size);
193193
return dr->data;
194194
}
195195
EXPORT_SYMBOL_GPL(__devres_alloc_node);
@@ -607,8 +607,8 @@ void *devres_open_group(struct device *dev, void *id, gfp_t gfp)
607607

608608
devres_node_init(&grp->node[0], &group_open_release, devres_group_free);
609609
devres_node_init(&grp->node[1], &group_close_release, NULL);
610-
set_node_dbginfo(&grp->node[0], "grp<", 0);
611-
set_node_dbginfo(&grp->node[1], "grp>", 0);
610+
devres_set_node_dbginfo(&grp->node[0], "grp<", 0);
611+
devres_set_node_dbginfo(&grp->node[1], "grp>", 0);
612612
grp->id = grp;
613613
if (id)
614614
grp->id = id;
@@ -796,7 +796,7 @@ int __devm_add_action(struct device *dev, void (*action)(void *), void *data, co
796796
return -ENOMEM;
797797

798798
devres_node_init(&devres->node, devm_action_release, devm_action_free);
799-
set_node_dbginfo(&devres->node, name, sizeof(*devres));
799+
devres_set_node_dbginfo(&devres->node, name, sizeof(*devres));
800800

801801
devres->action.data = data;
802802
devres->action.action = action;
@@ -956,7 +956,7 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp)
956956
* This is named devm_kzalloc_release for historical reasons
957957
* The initial implementation did not support kmalloc, only kzalloc
958958
*/
959-
set_node_dbginfo(&dr->node, "devm_kzalloc_release", size);
959+
devres_set_node_dbginfo(&dr->node, "devm_kzalloc_release", size);
960960
devres_add(dev, dr->data);
961961
return dr->data;
962962
}
@@ -1027,7 +1027,7 @@ void *devm_krealloc(struct device *dev, void *ptr, size_t new_size, gfp_t gfp)
10271027
if (!new_dr)
10281028
return NULL;
10291029

1030-
set_node_dbginfo(&new_dr->node, "devm_krealloc_release", new_size);
1030+
devres_set_node_dbginfo(&new_dr->node, "devm_krealloc_release", new_size);
10311031

10321032
/*
10331033
* The spinlock protects the linked list against concurrent

0 commit comments

Comments
 (0)