mirror of
https://github.com/torvalds/linux
synced 2024-09-21 11:38:48 +00:00
Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next
This commit is contained in:
commit
365c9ee073
|
@ -303,6 +303,7 @@ static void regmap_unlock_mutex(void *__map)
|
|||
}
|
||||
|
||||
static void regmap_lock_spinlock(void *__map)
|
||||
__acquires(&map->spinlock)
|
||||
{
|
||||
struct regmap *map = __map;
|
||||
unsigned long flags;
|
||||
|
@ -312,6 +313,7 @@ static void regmap_lock_spinlock(void *__map)
|
|||
}
|
||||
|
||||
static void regmap_unlock_spinlock(void *__map)
|
||||
__releases(&map->spinlock)
|
||||
{
|
||||
struct regmap *map = __map;
|
||||
spin_unlock_irqrestore(&map->spinlock, map->spinlock_flags);
|
||||
|
|
Loading…
Reference in a new issue