aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-31 19:25:16 +0100
committerMark Brown <broonie@linaro.org>2013-08-31 19:25:16 +0100
commit365c9ee0731de96046cc7749b46a5e7a0b0ceb65 (patch)
tree6ac555cb5cd296491d94216aaa3fd0e51685c0e7 /drivers/base/regmap/regmap.c
parent4460d028d4779900802d2184334d90d7ef1d2600 (diff)
parentb4519c71c45b31f5acd6db984c8830e52120323a (diff)
downloadlinux-linaro-stable-365c9ee0731de96046cc7749b46a5e7a0b0ceb65.tar.gz
Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index aaf4e1372980..7d689a15c500 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -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);