From: Mark Brown <broonie@kernel.org>
Date: Fri, 12 Jan 2018 20:04:01 +0000 (+0000)
Subject: Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a75de77211842a7e120ce95ad156e4b3704dcde7;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next
---

a75de77211842a7e120ce95ad156e4b3704dcde7
diff --cc drivers/base/regmap/regmap.c
index be55e5a0e38c,d23a5c99b639,025c62358bd6..ee302ccdfbc8
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@ -456,12 -456,7 -457,8 +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;
@@@@ -1124,10 -1109,8 -1118,8 +1126,10 @@@@ err_range
   	regmap_range_exit(map);
   	kfree(map->work_buf);
   err_hwlock:
  -	if (IS_ENABLED(REGMAP_HWSPINLOCK) && map->hwlock)
  +	if (map->hwlock)
   		hwspin_lock_free(map->hwlock);
 ++err_name:
 ++	kfree_const(map->name);
   err_map:
   	kfree(map);
   err:
@@@@ -1315,9 -1298,8 -1307,8 +1317,9 @@@@ void regmap_exit(struct regmap *map
   		kfree(async->work_buf);
   		kfree(async);
   	}
  -	if (IS_ENABLED(REGMAP_HWSPINLOCK) && map->hwlock)
  +	if (map->hwlock)
   		hwspin_lock_free(map->hwlock);
 ++	kfree_const(map->name);
   	kfree(map);
   }
   EXPORT_SYMBOL_GPL(regmap_exit);