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

Commit 9c473626 authored by Michael Walle's avatar Michael Walle Committed by Greg Kroah-Hartman
Browse files

of: property: define of_property_read_u{8,16,32,64}_array() unconditionally 



[ Upstream commit 2ca42c3ad9ed875b136065b010753a4caaaa1d38 ]

We can get rid of all the empty stubs because all these functions call
of_property_read_variable_u{8,16,32,64}_array() which already have an
empty stub if CONFIG_OF is not defined.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220118173504.2867523-3-michael@walle.cc


Stable-dep-of: 171eb6f71e9e ("ASoC: meson: meson-card-utils: use of_property_present() for DT parsing")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 20fa617f

include/linux/of.h

+124 −150
Original line number Original line Diff line number Diff line
@@ -415,130 +415,6 @@ extern int of_detach_node(struct device_node *); 




#define of_match_ptr(_ptr)	(_ptr)

#define of_match_ptr(_ptr)	(_ptr)





/**

 * of_property_read_u8_array - Find and read an array of u8 from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 8-bit value(s) from

 * it.

 *

 * dts entry of array should be like:

 *  ``property = /bits/ 8 <0x50 0x60 0x70>;``

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u8 value can be decoded.

 */

static inline int of_property_read_u8_array(const struct device_node *np,

					    const char *propname,

					    u8 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u8_array(np, propname, out_values,

						     sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u16_array - Find and read an array of u16 from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 16-bit value(s) from

 * it.

 *

 * dts entry of array should be like:

 *  ``property = /bits/ 16 <0x5000 0x6000 0x7000>;``

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u16 value can be decoded.

 */

static inline int of_property_read_u16_array(const struct device_node *np,

					     const char *propname,

					     u16 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u16_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u32_array - Find and read an array of 32 bit integers

 * from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 32-bit value(s) from

 * it.

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u32 value can be decoded.

 */

static inline int of_property_read_u32_array(const struct device_node *np,

					     const char *propname,

					     u32 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u32_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u64_array - Find and read an array of 64 bit integers

 * from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 64-bit value(s) from

 * it.

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u64 value can be decoded.

 */

static inline int of_property_read_u64_array(const struct device_node *np,

					     const char *propname,

					     u64 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u64_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/*

/*

 * struct property *prop;

 * struct property *prop;

 * const __be32 *p;

 * const __be32 *p;
@@ -719,32 +595,6 @@ static inline int of_property_count_elems_of_size(const struct device_node *np, 
	return -ENOSYS;

	return -ENOSYS;

}

}





static inline int of_property_read_u8_array(const struct device_node *np,

			const char *propname, u8 *out_values, size_t sz)

{

	return -ENOSYS;

}



static inline int of_property_read_u16_array(const struct device_node *np,

			const char *propname, u16 *out_values, size_t sz)

{

	return -ENOSYS;

}



static inline int of_property_read_u32_array(const struct device_node *np,

					     const char *propname,

					     u32 *out_values, size_t sz)

{

	return -ENOSYS;

}



static inline int of_property_read_u64_array(const struct device_node *np,

					     const char *propname,

					     u64 *out_values, size_t sz)

{

	return -ENOSYS;

}



static inline int of_property_read_u32_index(const struct device_node *np,

static inline int of_property_read_u32_index(const struct device_node *np,

			const char *propname, u32 index, u32 *out_value)

			const char *propname, u32 index, u32 *out_value)

{

{
@@ -1206,6 +1056,130 @@ static inline bool of_property_read_bool(const struct device_node *np, 
	return prop ? true : false;

	return prop ? true : false;

}

}





/**

 * of_property_read_u8_array - Find and read an array of u8 from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 8-bit value(s) from

 * it.

 *

 * dts entry of array should be like:

 *  ``property = /bits/ 8 <0x50 0x60 0x70>;``

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u8 value can be decoded.

 */

static inline int of_property_read_u8_array(const struct device_node *np,

					    const char *propname,

					    u8 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u8_array(np, propname, out_values,

						     sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u16_array - Find and read an array of u16 from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 16-bit value(s) from

 * it.

 *

 * dts entry of array should be like:

 *  ``property = /bits/ 16 <0x5000 0x6000 0x7000>;``

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u16 value can be decoded.

 */

static inline int of_property_read_u16_array(const struct device_node *np,

					     const char *propname,

					     u16 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u16_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u32_array - Find and read an array of 32 bit integers

 * from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 32-bit value(s) from

 * it.

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u32 value can be decoded.

 */

static inline int of_property_read_u32_array(const struct device_node *np,

					     const char *propname,

					     u32 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u32_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



/**

 * of_property_read_u64_array - Find and read an array of 64 bit integers

 * from a property.

 *

 * @np:		device node from which the property value is to be read.

 * @propname:	name of the property to be searched.

 * @out_values:	pointer to return value, modified only if return value is 0.

 * @sz:		number of array elements to read

 *

 * Search for a property in a device node and read 64-bit value(s) from

 * it.

 *

 * Return: 0 on success, -EINVAL if the property does not exist,

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

 * property data isn't large enough.

 *

 * The out_values is modified only if a valid u64 value can be decoded.

 */

static inline int of_property_read_u64_array(const struct device_node *np,

					     const char *propname,

					     u64 *out_values, size_t sz)

{

	int ret = of_property_read_variable_u64_array(np, propname, out_values,

						      sz, 0);

	if (ret >= 0)

		return 0;

	else

		return ret;

}



static inline int of_property_read_u8(const struct device_node *np,

static inline int of_property_read_u8(const struct device_node *np,

				       const char *propname,

				       const char *propname,

				       u8 *out_value)

				       u8 *out_value)