diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-02 20:49:57 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-02 20:49:57 -1000 |
| commit | a6b11f53388973d99c4a357c22b19753b424e73c (patch) | |
| tree | f0c31698f4f3ba47e44d34f7f5077ddde6079850 /include | |
| parent | 73a9fe86fa21ccd528807b8cc871dc18be67ee5a (diff) | |
| parent | d945fa0da7db9ace61fbb2140cfdb1e2d2b24e7e (diff) | |
| download | lwn-a6b11f53388973d99c4a357c22b19753b424e73c.tar.gz lwn-a6b11f53388973d99c4a357c22b19753b424e73c.zip | |
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
MAINTAINERS: Add keyword match for of_match_table to device tree section
of: constify property name parameters for helper functions
input: xilinx_ps2: Add missing of_address.h header
of: address: use resource_size helper
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index bd716f8908de..0085bb01c041 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -196,12 +196,13 @@ extern struct property *of_find_property(const struct device_node *np, const char *name, int *lenp); extern int of_property_read_u32_array(const struct device_node *np, - char *propname, + const char *propname, u32 *out_values, size_t sz); -extern int of_property_read_string(struct device_node *np, char *propname, - const char **out_string); +extern int of_property_read_string(struct device_node *np, + const char *propname, + const char **out_string); extern int of_device_is_compatible(const struct device_node *device, const char *); extern int of_device_is_available(const struct device_node *device); @@ -242,13 +243,15 @@ static inline bool of_have_populated_dt(void) } static inline int of_property_read_u32_array(const struct device_node *np, - char *propname, u32 *out_values, size_t sz) + const 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) + const char *propname, + const char **out_string) { return -ENOSYS; } @@ -256,7 +259,7 @@ static inline int of_property_read_string(struct device_node *np, #endif /* CONFIG_OF */ static inline int of_property_read_u32(const struct device_node *np, - char *propname, + const char *propname, u32 *out_value) { return of_property_read_u32_array(np, propname, out_value, 1); |