devres: add devres_node_remove()

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.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patch.msgid.link/20260213220718.82835-4-dakr@kernel.org
Signed-off-by: Danilo Krummrich <dakr@kernel.org>

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 23828bd920db79ac34db722386654b643d384288..c9812f0a56b06cd3d57466d03db9d4be08bddf1d 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -231,6 +231,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 22d10b30774f12bc64d288868e31b10e5a18b630..6c7854d4e4a8a7b74f9dfc1e8720531bbc39a568 100644 (file)
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -365,6 +365,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