From: Mark Brown <broonie@kernel.org>
Date: Wed, 13 Dec 2017 16:46:37 +0000 (+0000)
Subject: Merge branches 'topic/hwspinlock' and 'topic/nolock' of https://git.kernel.org/pub... 
X-Git-Tag: v4.16-rc1~186^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4045559c099998642e35d1444251c3bf042c7a4f;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'topic/hwspinlock' and 'topic/nolock' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-const
---

4045559c099998642e35d1444251c3bf042c7a4f
diff --cc drivers/base/regmap/regmap.c
index f25ab18ca0571,df9ca36753ffd..496da7bc5e778
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -456,7 -457,13 +456,12 @@@ static void regmap_unlock_hwlock_irqres
  
  	hwspin_unlock_irqrestore(map->hwlock, &map->spinlock_flags);
  }
 -#endif
  
+ static void regmap_lock_unlock_none(void *__map)
+ {
+ 
+ }
+ 
  static void regmap_lock_mutex(void *__map)
  {
  	struct regmap *map = __map;