Commit 365c9ee0 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next

parents 4460d028 b4519c71
...@@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map) ...@@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map)
} }
static void regmap_lock_spinlock(void *__map) static void regmap_lock_spinlock(void *__map)
__acquires(&map->spinlock)
{ {
struct regmap *map = __map; struct regmap *map = __map;
unsigned long flags; unsigned long flags;
...@@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map) ...@@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map)
} }
static void regmap_unlock_spinlock(void *__map) static void regmap_unlock_spinlock(void *__map)
__releases(&map->spinlock)
{ {
struct regmap *map = __map; struct regmap *map = __map;
spin_unlock_irqrestore(&map->spinlock, map->spinlock_flags); spin_unlock_irqrestore(&map->spinlock, map->spinlock_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment