diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:58 +0000 |
| commit | da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb (patch) | |
| tree | 66d5a4804f0a15b5dc224bb2de9b0d9cb208eb91 /include/linux | |
| parent | c6c124225f9551d78a19c291a2e204618f7e1e92 (diff) | |
| parent | 5c1d5f091dc39eecf9a34a8be01492d14c23ad91 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regmap.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 4149f1a9b003..3e1a2e4a92ad 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -423,6 +423,8 @@ bool regmap_check_range_table(struct regmap *map, unsigned int reg, int regmap_register_patch(struct regmap *map, const struct reg_default *regs, int num_regs); +int regmap_parse_val(struct regmap *map, const void *buf, + unsigned int *val); static inline bool regmap_reg_in_range(unsigned int reg, const struct regmap_range *range) @@ -695,6 +697,13 @@ static inline int regmap_register_patch(struct regmap *map, return -EINVAL; } +static inline int regmap_parse_val(struct regmap *map, const void *buf, + unsigned int *val) +{ + WARN_ONCE(1, "regmap API is disabled"); + return -EINVAL; +} + static inline struct regmap *dev_get_regmap(struct device *dev, const char *name) { |