Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9017f252 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

driver core: Implement device property accessors through fwnode ones 



Now that the ACPI companions of devices are pointed to by the fwnode
field in struct device, the device_property_*() accessor functions
can be modified to use their fwnode_property_*() counterparts
internally with minimum extra overhead in the IS_ENABLED(CONFIG_OF)
case, so make those changes.

This allows us to get rid of the rather ugly DEV_PROP_READ_ARRAY()
macro among other things.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe0a20a3

drivers/base/property.c

+17 −28
Original line number Original line Diff line number Diff line
@@ -15,6 +15,12 @@ 
#include <linux/acpi.h>

#include <linux/acpi.h>

#include <linux/of.h>

#include <linux/of.h>





static inline struct fwnode_handle *dev_fwnode(struct device *dev)

{

	return IS_ENABLED(CONFIG_OF) && dev->of_node ?

		&dev->of_node->fwnode : dev->fwnode;

}



/**

/**

 * device_property_present - check if a property of a device is present

 * device_property_present - check if a property of a device is present

 * @dev: Device whose property is being checked

 * @dev: Device whose property is being checked
@@ -24,10 +30,7 @@ 
 */

 */

bool device_property_present(struct device *dev, const char *propname)

bool device_property_present(struct device *dev, const char *propname)

{

{

	if (IS_ENABLED(CONFIG_OF) && dev->of_node)

	return fwnode_property_present(dev_fwnode(dev), propname);

		return of_property_read_bool(dev->of_node, propname);



	return !acpi_dev_prop_get(ACPI_COMPANION(dev), propname, NULL);

}

}

EXPORT_SYMBOL_GPL(device_property_present);

EXPORT_SYMBOL_GPL(device_property_present);
@@ -47,17 +50,6 @@ bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname) 
}

}

EXPORT_SYMBOL_GPL(fwnode_property_present);

EXPORT_SYMBOL_GPL(fwnode_property_present);





#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval) \

	(val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \

	      : of_property_count_elems_of_size((node), (propname), sizeof(type))



#define DEV_PROP_READ_ARRAY(_dev_, _propname_, _type_, _proptype_, _val_, _nval_) \

	IS_ENABLED(CONFIG_OF) && _dev_->of_node ? \

		(OF_DEV_PROP_READ_ARRAY(_dev_->of_node, _propname_, _type_, \

					_val_, _nval_)) : \

		acpi_dev_prop_read(ACPI_COMPANION(_dev_), _propname_, \

				   _proptype_, _val_, _nval_)



/**

/**

 * device_property_read_u8_array - return a u8 array property of a device

 * device_property_read_u8_array - return a u8 array property of a device

 * @dev: Device to get the property of

 * @dev: Device to get the property of
@@ -78,7 +70,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_present); 
int device_property_read_u8_array(struct device *dev, const char *propname,

int device_property_read_u8_array(struct device *dev, const char *propname,

				  u8 *val, size_t nval)

				  u8 *val, size_t nval)

{

{

	return DEV_PROP_READ_ARRAY(dev, propname, u8, DEV_PROP_U8, val, nval);

	return fwnode_property_read_u8_array(dev_fwnode(dev), propname, val, nval);

}

}

EXPORT_SYMBOL_GPL(device_property_read_u8_array);

EXPORT_SYMBOL_GPL(device_property_read_u8_array);
@@ -102,7 +94,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u8_array); 
int device_property_read_u16_array(struct device *dev, const char *propname,

int device_property_read_u16_array(struct device *dev, const char *propname,

				   u16 *val, size_t nval)

				   u16 *val, size_t nval)

{

{

	return DEV_PROP_READ_ARRAY(dev, propname, u16, DEV_PROP_U16, val, nval);

	return fwnode_property_read_u16_array(dev_fwnode(dev), propname, val, nval);

}

}

EXPORT_SYMBOL_GPL(device_property_read_u16_array);

EXPORT_SYMBOL_GPL(device_property_read_u16_array);
@@ -126,7 +118,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u16_array); 
int device_property_read_u32_array(struct device *dev, const char *propname,

int device_property_read_u32_array(struct device *dev, const char *propname,

				   u32 *val, size_t nval)

				   u32 *val, size_t nval)

{

{

	return DEV_PROP_READ_ARRAY(dev, propname, u32, DEV_PROP_U32, val, nval);

	return fwnode_property_read_u32_array(dev_fwnode(dev), propname, val, nval);

}

}

EXPORT_SYMBOL_GPL(device_property_read_u32_array);

EXPORT_SYMBOL_GPL(device_property_read_u32_array);
@@ -150,7 +142,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u32_array); 
int device_property_read_u64_array(struct device *dev, const char *propname,

int device_property_read_u64_array(struct device *dev, const char *propname,

				   u64 *val, size_t nval)

				   u64 *val, size_t nval)

{

{

	return DEV_PROP_READ_ARRAY(dev, propname, u64, DEV_PROP_U64, val, nval);

	return fwnode_property_read_u64_array(dev_fwnode(dev), propname, val, nval);

}

}

EXPORT_SYMBOL_GPL(device_property_read_u64_array);

EXPORT_SYMBOL_GPL(device_property_read_u64_array);
@@ -174,11 +166,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u64_array); 
int device_property_read_string_array(struct device *dev, const char *propname,

int device_property_read_string_array(struct device *dev, const char *propname,

				      const char **val, size_t nval)

				      const char **val, size_t nval)

{

{

	return IS_ENABLED(CONFIG_OF) && dev->of_node ?

	return fwnode_property_read_string_array(dev_fwnode(dev), propname, val, nval);

		(val ? of_property_read_string_array(dev->of_node, propname, val, nval)

		     : of_property_count_strings(dev->of_node, propname)) :

		acpi_dev_prop_read(ACPI_COMPANION(dev), propname,

				   DEV_PROP_STRING, val, nval);

}

}

EXPORT_SYMBOL_GPL(device_property_read_string_array);

EXPORT_SYMBOL_GPL(device_property_read_string_array);
@@ -199,13 +187,14 @@ EXPORT_SYMBOL_GPL(device_property_read_string_array); 
int device_property_read_string(struct device *dev, const char *propname,

int device_property_read_string(struct device *dev, const char *propname,

				const char **val)

				const char **val)

{

{

	return IS_ENABLED(CONFIG_OF) && dev->of_node ?

	return fwnode_property_read_string(dev_fwnode(dev), propname, val);

		of_property_read_string(dev->of_node, propname, val) :

		acpi_dev_prop_read(ACPI_COMPANION(dev), propname,

				   DEV_PROP_STRING, val, 1);

}

}

EXPORT_SYMBOL_GPL(device_property_read_string);

EXPORT_SYMBOL_GPL(device_property_read_string);





#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval) \

	(val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \

	      : of_property_count_elems_of_size((node), (propname), sizeof(type))



#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \

#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \

({ \

({ \

	int _ret_; \

	int _ret_; \