From 87f1720a7fcd86fc2de899ba0263b46e5caec508 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Dec 2024 11:15:32 +0000 Subject: [PATCH] Revert "device property: Constify device child node APIs" This reverts commit 0ba045ab08a9ce14643e60e6a349903777059bdb which is commit 7952cd2b8213f20a1752634c25dfd215da537722 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I4aba9d5a6b2b8467e5ed1a0cde4f87018ecf256a Signed-off-by: Greg Kroah-Hartman --- drivers/base/property.c | 6 +++--- include/linux/property.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 724b65a17b2a..b0c40d973484 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -783,7 +783,7 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_available_child_node); * fwnode pointer. Note that this function also puts a reference to @child * unconditionally. */ -struct fwnode_handle *device_get_next_child_node(const struct device *dev, +struct fwnode_handle *device_get_next_child_node(struct device *dev, struct fwnode_handle *child) { const struct fwnode_handle *fwnode = dev_fwnode(dev); @@ -826,7 +826,7 @@ EXPORT_SYMBOL_GPL(fwnode_get_named_child_node); * The caller is responsible for calling fwnode_handle_put() on the returned * fwnode pointer. */ -struct fwnode_handle *device_get_named_child_node(const struct device *dev, +struct fwnode_handle *device_get_named_child_node(struct device *dev, const char *childname) { return fwnode_get_named_child_node(dev_fwnode(dev), childname); @@ -892,7 +892,7 @@ EXPORT_SYMBOL_GPL(fwnode_device_is_available); * * Return: the number of child nodes for a given device. */ -unsigned int device_get_child_node_count(const struct device *dev) +unsigned int device_get_child_node_count(struct device *dev) { struct fwnode_handle *child; unsigned int count = 0; diff --git a/include/linux/property.h b/include/linux/property.h index 8a30136c2875..117cc200c656 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -109,16 +109,16 @@ struct fwnode_handle *fwnode_get_next_available_child_node( for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) -struct fwnode_handle *device_get_next_child_node(const struct device *dev, - struct fwnode_handle *child); +struct fwnode_handle *device_get_next_child_node( + struct device *dev, struct fwnode_handle *child); #define device_for_each_child_node(dev, child) \ for (child = device_get_next_child_node(dev, NULL); child; \ child = device_get_next_child_node(dev, child)) -struct fwnode_handle *fwnode_get_named_child_node(const struct fwnode_handle *fwnode, - const char *childname); -struct fwnode_handle *device_get_named_child_node(const struct device *dev, +struct fwnode_handle *fwnode_get_named_child_node( + const struct fwnode_handle *fwnode, const char *childname); +struct fwnode_handle *device_get_named_child_node(struct device *dev, const char *childname); struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode); @@ -127,7 +127,7 @@ void fwnode_handle_put(struct fwnode_handle *fwnode); int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index); int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name); -unsigned int device_get_child_node_count(const struct device *dev); +unsigned int device_get_child_node_count(struct device *dev); static inline bool device_property_read_bool(struct device *dev, const char *propname)