Commit 96c623e5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

of: add of_property_read_variable_* dummy helpers 



Commit a67e9472 ("of: Add array read functions with min/max size
limits") added a new interface for reading variable-length arrays from
DT properties. One user was added in dsa recently and this causes a
build error because that code can be built with CONFIG_OF disabled:

net/dsa/dsa2.c: In function 'dsa_switch_parse_member_of':
net/dsa/dsa2.c:678:7: error: implicit declaration of function 'of_property_read_variable_u32_array'; did you mean 'of_property_read_u32_array'? [-Werror=implicit-function-declaration]

This adds a dummy functions for of_property_read_variable_u32_array()
and a few others that had been missing here. I decided to move
of_property_read_string() and of_property_read_string_helper() in the
process to make it easier to compare the two sets of function prototypes
to make sure they match.

Fixes: 975e6e32 ("net: dsa: rework switch parsing")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42ca728b

include/linux/of.h

+50 −12
Original line number Diff line number Diff line
@@ -675,12 +675,6 @@ static inline int of_property_count_elems_of_size(const struct device_node *np, 
	return -ENOSYS;

}



static inline int of_property_read_u32_index(const struct device_node *np,

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

{

	return -ENOSYS;

}



static inline int of_property_read_u8_array(const struct device_node *np,

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

{
@@ -707,16 +701,14 @@ static inline int of_property_read_u64_array(const struct device_node *np, 
	return -ENOSYS;

}



static inline int of_property_read_string(const struct device_node *np,

					  const char *propname,

					  const char **out_string)

static inline int of_property_read_u32_index(const struct device_node *np,

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

{

	return -ENOSYS;

}



static inline int of_property_read_string_helper(const struct device_node *np,

						 const char *propname,

						 const char **out_strs, size_t sz, int index)

static inline int of_property_read_u64_index(const struct device_node *np,

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

{

	return -ENOSYS;

}
@@ -744,12 +736,51 @@ static inline int of_n_size_cells(struct device_node *np) 
	return 0;

}



static inline int of_property_read_variable_u8_array(const struct device_node *np,

					const char *propname, u8 *out_values,

					size_t sz_min, size_t sz_max)

{

	return -ENOSYS;

}



static inline int of_property_read_variable_u16_array(const struct device_node *np,

					const char *propname, u16 *out_values,

					size_t sz_min, size_t sz_max)

{

	return -ENOSYS;

}



static inline int of_property_read_variable_u32_array(const struct device_node *np,

					const char *propname,

					u32 *out_values,

					size_t sz_min,

					size_t sz_max)

{

	return -ENOSYS;

}



static inline int of_property_read_u64(const struct device_node *np,

				       const char *propname, u64 *out_value)

{

	return -ENOSYS;

}



static inline int of_property_read_variable_u64_array(const struct device_node *np,

					const char *propname,

					u64 *out_values,

					size_t sz_min,

					size_t sz_max)

{

	return -ENOSYS;

}



static inline int of_property_read_string(const struct device_node *np,

					  const char *propname,

					  const char **out_string)

{

	return -ENOSYS;

}



static inline int of_property_match_string(const struct device_node *np,

					   const char *propname,

					   const char *string)
@@ -757,6 +788,13 @@ static inline int of_property_match_string(const struct device_node *np, 
	return -ENOSYS;

}



static inline int of_property_read_string_helper(const struct device_node *np,

						 const char *propname,

						 const char **out_strs, size_t sz, int index)

{

	return -ENOSYS;

}



static inline struct device_node *of_parse_phandle(const struct device_node *np,

						   const char *phandle_name,

						   int index)

CRA Git | Maintained and supported by SUSTech CRA and CCSE