Merge branches 'topic/hwspinlock' and 'topic/nolock' of https://git.kernel.org/pub...

diff --cc drivers/base/regmap/regmap.c
index f25ab18ca0571600ae04a0cfa7d6b90d09212cad,df9ca36753ffdbddac5d261cfa0b0f44ceaa59ed..496da7bc5e778be17d5b51acd9c8d9e64c1f5b0c
--- 1/drivers/base/regmap/regmap.c
--- 2/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;