[PATCH v2 3/5] devres: add devres_node_remove()

From: Danilo Krummrich

Date: Fri Feb 13 2026 - 17:09:29 EST


When the Rust Devres<T> container type is dropped we need a way to
remove the embedded struct devres_node from the device's node list.

Signed-off-by: Danilo Krummrich <dakr@xxxxxxxxxx>
---
drivers/base/base.h | 1 +
drivers/base/devres.c | 16 ++++++++++++++++
2 files changed, 17 insertions(+)

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 0ad52a847bd0..93b2020baa99 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -237,6 +237,7 @@ struct devres_node {
void devres_node_init(struct devres_node *node, dr_node_release_t release,
dr_node_free_t free_node);
void devres_node_add(struct device *dev, struct devres_node *node);
+bool devres_node_remove(struct device *dev, struct devres_node *node);
void devres_for_each_res(struct device *dev, dr_release_t release,
dr_match_t match, void *match_data,
void (*fn)(struct device *, void *, void *),
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index aa39e87082a1..bf51404e2bf4 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -361,6 +361,22 @@ void *devres_get(struct device *dev, void *new_res,
}
EXPORT_SYMBOL_GPL(devres_get);

+bool devres_node_remove(struct device *dev, struct devres_node *node)
+{
+ struct devres_node *__node;
+
+ guard(spinlock_irqsave)(&dev->devres_lock);
+ list_for_each_entry_reverse(__node, &dev->devres_head, entry) {
+ if (__node == node) {
+ list_del_init(&node->entry);
+ devres_log(dev, node, "REM");
+ return true;
+ }
+ }
+
+ return false;
+}
+
/**
* devres_remove - Find a device resource and remove it
* @dev: Device to find resource from
--
2.53.0