diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-08-05 19:01:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-05 19:01:34 +0100 |
| commit | f955c8ba265540617da67d528ea74e50d48ad2be (patch) | |
| tree | 50279d6dcedfaa0d735bef439944cea44c4ebf8a /include | |
| parent | Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next (diff) | |
| parent | Merge remote-tracking branch 'regmap/topic/getdev' into regmap-next (diff) | |
| download | linux-dev-f955c8ba265540617da67d528ea74e50d48ad2be.tar.xz linux-dev-f955c8ba265540617da67d528ea74e50d48ad2be.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regulator-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 7b0e4b425cdf..c5ed83f49c4e 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -396,6 +396,7 @@ void regmap_exit(struct regmap *map); int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config); struct regmap *dev_get_regmap(struct device *dev, const char *name); +struct device *regmap_get_device(struct regmap *map); int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val); int regmap_raw_write(struct regmap *map, unsigned int reg, @@ -729,6 +730,12 @@ static inline struct regmap *dev_get_regmap(struct device *dev, return NULL; } +static inline struct device *regmap_get_device(struct regmap *map) +{ + WARN_ONCE(1, "regmap API is disabled"); + return NULL; +} + #endif #endif |