summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorBartosz Golaszewski <brgl@bgdev.pl>2017-12-06 17:26:21 +0300
committerMark Brown <broonie@kernel.org>2017-12-06 18:30:02 +0300
commitc9b41fcf272b4926b373d21c2b83dfe374313780 (patch)
treef65469c68d6f4bc64c9365a42e482f1e9b54fc8e /drivers/base
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
downloadlinux-c9b41fcf272b4926b373d21c2b83dfe374313780.tar.xz
regmap: allow to disable all locking mechanisms
We have a use case in the at24 EEPROM driver (recently converted to using regmap instead of raw i2c/smbus calls) where we read from/write to the regmap in a loop, while protecting the entire loop with a mutex. Currently this implicitly makes us use two mutexes - one in the driver and one in regmap. While browsing the code for similar use cases I noticed a significant number of places where locking *seems* redundant. Allow users to completely disable any locking mechanisms in regmap config. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 8d516a9bfc01..72917b2fc10e 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -459,6 +459,11 @@ static void regmap_unlock_hwlock_irqrestore(void *__map)
}
#endif
+static void regmap_lock_unlock_empty(void *__map)
+{
+
+}
+
static void regmap_lock_mutex(void *__map)
{
struct regmap *map = __map;
@@ -669,7 +674,9 @@ struct regmap *__regmap_init(struct device *dev,
goto err;
}
- if (config->lock && config->unlock) {
+ if (config->disable_locking) {
+ map->lock = map->unlock = regmap_lock_unlock_empty;
+ } else if (config->lock && config->unlock) {
map->lock = config->lock;
map->unlock = config->unlock;
map->lock_arg = config->lock_arg;