shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "device property: Constify device child node APIs"

Browse Source 
This reverts commit 0ba045ab08 which is
commit 7952cd2b82 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-12-30 11:15:32 +00:00
parent 8d0582984f
commit 87f1720a7f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/base/property.c
View File

@@ -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 * fwnode pointer. Note that this function also puts a reference to @child
* unconditionally. * 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) struct fwnode_handle *child)
{ {
const struct fwnode_handle *fwnode = dev_fwnode(dev); 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 * The caller is responsible for calling fwnode_handle_put() on the returned
* fwnode pointer. * 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) const char *childname)
{ {
return fwnode_get_named_child_node(dev_fwnode(dev), 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. * 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; struct fwnode_handle *child;
unsigned int count = 0; unsigned int count = 0;

12
include/linux/property.h
View File

@@ -109,16 +109,16 @@ struct fwnode_handle *fwnode_get_next_available_child_node(
for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\
child = fwnode_get_next_available_child_node(fwnode, 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 *device_get_next_child_node(
struct fwnode_handle *child); struct device *dev, struct fwnode_handle *child);
#define device_for_each_child_node(dev, child) \ #define device_for_each_child_node(dev, child) \
for (child = device_get_next_child_node(dev, NULL); child; \ for (child = device_get_next_child_node(dev, NULL); child; \
child = device_get_next_child_node(dev, child)) child = device_get_next_child_node(dev, child))
struct fwnode_handle *fwnode_get_named_child_node(const struct fwnode_handle *fwnode, struct fwnode_handle *fwnode_get_named_child_node(
const char *childname); const struct fwnode_handle *fwnode, const char *childname);
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); const char *childname);
struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode); 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(const struct fwnode_handle *fwnode, unsigned int index);
int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name); 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, static inline bool device_property_read_bool(struct device *dev,
const char *propname) const char *propname)