diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:41 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:41 +0200 |
commit | d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (patch) | |
tree | 662664ac398af8749af7f3c69bb298394a0fc057 /include | |
parent | e9299c644a17b7ae6a91d3a4b6ccdd9acba443fe (diff) | |
parent | 8fc0a99f32ea083b2e0eee217c813cf36aa8c521 (diff) | |
download | barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.gz barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.xz |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'include')
-rw-r--r-- | include/aiodev.h | 3 | ||||
-rw-r--r-- | include/asm-generic/bitio.h | 2 | ||||
-rw-r--r-- | include/linux/string.h | 1 | ||||
-rw-r--r-- | include/of.h | 2 | ||||
-rw-r--r-- | include/regulator.h | 2 | ||||
-rw-r--r-- | include/string.h | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/include/aiodev.h b/include/aiodev.h index 65d817f296..d557715671 100644 --- a/include/aiodev.h +++ b/include/aiodev.h @@ -31,7 +31,8 @@ struct aiodevice { int aiodevice_register(struct aiodevice *aiodev); struct aiochannel *aiochannel_get(struct device_d *dev, int index); -struct aiochannel *aiochannel_get_by_name(const char *name); +/* Find aiochannel by channel name, e.g. "aiodev0.in_value0_mV" */ +struct aiochannel *aiochannel_by_name(const char *name); int aiochannel_get_value(struct aiochannel *aiochan, int *value); int aiochannel_get_index(struct aiochannel *aiochan); diff --git a/include/asm-generic/bitio.h b/include/asm-generic/bitio.h index e88dbd7b85..99b85da59c 100644 --- a/include/asm-generic/bitio.h +++ b/include/asm-generic/bitio.h @@ -3,7 +3,7 @@ #ifndef __ASM_GENERIC_BITIO_H #define __ASM_GENERIC_BITIO_H -#include <asm-generic/io.h> +#include <asm/io.h> /* * Clear and set bits in one shot. These macros can be used to clear and diff --git a/include/linux/string.h b/include/linux/string.h index 2b699957e8..85c3eb1de3 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -10,7 +10,6 @@ extern "C" { extern char * strpbrk(const char *,const char *); extern char * strsep(char **,const char *); -extern char * strsep_unescaped(char **,const char *); extern __kernel_size_t strspn(const char *,const char *); diff --git a/include/of.h b/include/of.h index d548e51789..e60cb5307d 100644 --- a/include/of.h +++ b/include/of.h @@ -231,6 +231,8 @@ extern int of_property_write_u64_array(struct device_node *np, size_t sz); extern int of_property_write_string(struct device_node *np, const char *propname, const char *value); +extern int of_property_write_strings(struct device_node *np, const char *propname, + ...) __attribute__((__sentinel__)); extern struct device_node *of_parse_phandle(const struct device_node *np, const char *phandle_name, diff --git a/include/regulator.h b/include/regulator.h index 44eee7b0ad..7c2a01b687 100644 --- a/include/regulator.h +++ b/include/regulator.h @@ -2,6 +2,8 @@ #ifndef __REGULATOR_H #define __REGULATOR_H +struct device_d; + /* struct regulator is an opaque object for consumers */ struct regulator; diff --git a/include/string.h b/include/string.h index 727bc51934..b51566fd00 100644 --- a/include/string.h +++ b/include/string.h @@ -5,6 +5,8 @@ #include <linux/string.h> int strtobool(const char *str, int *val); +char *strsep_unescaped(char **, const char *); +char *stpcpy(char *dest, const char *src); void *__default_memset(void *, int, __kernel_size_t); void *__nokasan_default_memset(void *, int, __kernel_size_t); |