[lkml]   [2017]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
SubjectApplied "regmap: rename regmap_lock_unlock_empty() to regmap_lock_unlock_none()" to the regmap tree
The patch

regmap: rename regmap_lock_unlock_empty() to regmap_lock_unlock_none()

has been applied to the regmap tree at

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


From 81e30b189f593afbf10a7bf47f18f030f8aea3b5 Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <>
Date: Wed, 13 Dec 2017 10:28:10 +0100
Subject: [PATCH] regmap: rename regmap_lock_unlock_empty() to

Minor naming convention tweak.

Suggested-by: Andy Shevchenko <>
Signed-off-by: Bartosz Golaszewski <>
Signed-off-by: Mark Brown <>
drivers/base/regmap/regmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 72917b2fc10e..54b1aa371c61 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -459,7 +459,7 @@ static void regmap_unlock_hwlock_irqrestore(void *__map)

-static void regmap_lock_unlock_empty(void *__map)
+static void regmap_lock_unlock_none(void *__map)

@@ -675,7 +675,7 @@ struct regmap *__regmap_init(struct device *dev,

if (config->disable_locking) {
- map->lock = map->unlock = regmap_lock_unlock_empty;
+ map->lock = map->unlock = regmap_lock_unlock_none;
} else if (config->lock && config->unlock) {
map->lock = config->lock;
map->unlock = config->unlock;
 \ /
  Last update: 2017-12-13 16:47    [W:0.029 / U:1.756 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site