ACPI / property: Extend fwnode_property_* to data-only subnodes

Modify is_acpi_node() to return "true" for ACPI data-only subnodes as
well as for ACPI device objects and change the name of to_acpi_node()
to to_acpi_device_node() so it is clear that it covers ACPI device
objects only.  Accordingly, introduce to_acpi_data_node() to cover
data-only subnodes in an analogous way.

With that, make the fwnode_property_* family of functions work with
ACPI data-only subnodes introduced previously.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 2d75366c61e0..ca118169a6c5 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -134,7 +134,7 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
         if (is_of_node(fwnode))
                 return of_property_read_bool(to_of_node(fwnode), propname);
         else if (is_acpi_node(fwnode))
-                return !acpi_dev_prop_get(to_acpi_node(fwnode), propname, NULL);
+                return !acpi_node_prop_get(fwnode, propname, NULL);
 
         return !!pset_prop_get(to_pset(fwnode), propname);
 }
@@ -298,8 +298,8 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
                 _ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_, \
                                                _type_, _val_, _nval_); \
         else if (is_acpi_node(_fwnode_)) \
-                _ret_ = acpi_dev_prop_read(to_acpi_node(_fwnode_), _propname_, \
-                                           _proptype_, _val_, _nval_); \
+                _ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \
+                                            _val_, _nval_); \
         else if (is_pset(_fwnode_)) \
                 _ret_ = pset_prop_read_array(to_pset(_fwnode_), _propname_, \
                                              _proptype_, _val_, _nval_); \
@@ -440,8 +440,8 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
                                                       propname, val, nval) :
                         of_property_count_strings(to_of_node(fwnode), propname);
         else if (is_acpi_node(fwnode))
-                return acpi_dev_prop_read(to_acpi_node(fwnode), propname,
-                                          DEV_PROP_STRING, val, nval);
+                return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
+                                           val, nval);
         else if (is_pset(fwnode))
                 return pset_prop_read_array(to_pset(fwnode), propname,
                                             DEV_PROP_STRING, val, nval);
@@ -470,8 +470,8 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
         if (is_of_node(fwnode))
                 return of_property_read_string(to_of_node(fwnode), propname, val);
         else if (is_acpi_node(fwnode))
-                return acpi_dev_prop_read(to_acpi_node(fwnode), propname,
-                                          DEV_PROP_STRING, val, 1);
+                return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
+                                           val, 1);
 
         return pset_prop_read_array(to_pset(fwnode), propname,
                                     DEV_PROP_STRING, val, 1);
@@ -495,7 +495,7 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev,
         } else if (IS_ENABLED(CONFIG_ACPI)) {
                 struct acpi_device *node;
 
-                node = acpi_get_next_child(dev, to_acpi_node(child));
+                node = acpi_get_next_child(dev, to_acpi_device_node(child));
                 if (node)
                         return acpi_fwnode_handle(node);
         }