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

Commit 4fa7508e authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

device property: Return -ENXIO if there is no suitable FW interface 



Return -ENXIO if device property array access functions don't find
a suitable firmware interface.

This lets drivers decide if they should use available platform data
instead.

Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b3ae880

drivers/base/property.c

+13 −4
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_present); 
 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO if the property is not an array of numbers,

 *	   %-EOVERFLOW if the size of the property is not as expected.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				  u8 *val, size_t nval)
@@ -179,6 +180,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u8_array); 
 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO if the property is not an array of numbers,

 *	   %-EOVERFLOW if the size of the property is not as expected.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				   u16 *val, size_t nval)
@@ -203,6 +205,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u16_array); 
 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO if the property is not an array of numbers,

 *	   %-EOVERFLOW if the size of the property is not as expected.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				   u32 *val, size_t nval)
@@ -227,6 +230,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u32_array); 
 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO if the property is not an array of numbers,

 *	   %-EOVERFLOW if the size of the property is not as expected.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				   u64 *val, size_t nval)
@@ -251,6 +255,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u64_array); 
 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO or %-EILSEQ if the property is not an array of strings,

 *	   %-EOVERFLOW if the size of the property is not as expected.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				      const char **val, size_t nval)
@@ -272,6 +277,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string_array); 
 *	   %-EINVAL if given arguments are not valid,

 *	   %-ENODATA if the property does not have a value,

 *	   %-EPROTO or %-EILSEQ if the property type is not a string.

 *	   %-ENXIO if no suitable firmware interface is present.

 */

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

				const char **val)
@@ -293,9 +299,11 @@ EXPORT_SYMBOL_GPL(device_property_read_string); 
	else if (is_acpi_node(_fwnode_)) \

		_ret_ = acpi_dev_prop_read(to_acpi_node(_fwnode_), _propname_, \

					   _proptype_, _val_, _nval_); \

	else \

	else if (is_pset(_fwnode_)) \

		_ret_ = pset_prop_read_array(to_pset(_fwnode_), _propname_, \

					     _proptype_, _val_, _nval_); \

	else \

		_ret_ = -ENXIO; \

	_ret_; \

})
@@ -433,9 +441,10 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode, 
	else if (is_acpi_node(fwnode))

		return acpi_dev_prop_read(to_acpi_node(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);

	return -ENXIO;

}

EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);