diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-07-08 16:27:33 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-08 12:52:33 -0600 |
| commit | b98c0239204d6603b3a33bcc2b3916adaa8d4160 (patch) | |
| tree | db2c9e80e5c98dcf71c5345198fe55a938628b96 | |
| parent | 5a9ebe959967b7d3579de2a53d5df470fe0c7f22 (diff) | |
dt: add empty of_property_read_u32[_array] for non-dt
The patch adds empty functions of_property_read_u32 and
of_property_read_u32_array for non-dt build, so that drivers
migrating to dt can save some '#ifdef CONFIG_OF'.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
[grant.likely: Moved things around so only one new static inline is needed]
[grant.likely: Added _string variant]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | include/linux/of.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index b5f1c88e40a..bd716f8908d 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -200,13 +200,6 @@ extern int of_property_read_u32_array(const struct device_node *np, u32 *out_values, size_t sz); -static inline int of_property_read_u32(const struct device_node *np, - char *propname, - u32 *out_value) -{ - return of_property_read_u32_array(np, propname, out_value, 1); -} - extern int of_property_read_string(struct device_node *np, char *propname, const char **out_string); extern int of_device_is_compatible(const struct device_node *device, @@ -241,12 +234,32 @@ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); #endif -#else +#else /* CONFIG_OF */ static inline bool of_have_populated_dt(void) { return false; } +static inline int of_property_read_u32_array(const struct device_node *np, + char *propname, u32 *out_values, size_t sz) +{ + return -ENOSYS; +} + +static inline int of_property_read_string(struct device_node *np, + char *propname, const char **out_string) +{ + return -ENOSYS; +} + #endif /* CONFIG_OF */ + +static inline int of_property_read_u32(const struct device_node *np, + char *propname, + u32 *out_value) +{ + return of_property_read_u32_array(np, propname, out_value, 1); +} + #endif /* _LINUX_OF_H */ |