diff options
author | Wang, Yalin <Yalin.Wang@sonymobile.com> | 2014-12-15 09:05:50 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-15 18:41:07 +0100 |
commit | f93d1be217d89f258f0108a8cd64b98cb8fa9e73 (patch) | |
tree | 6a7186e430e3b5c4e62b276b517a054b5c4fbd66 /drivers/base | |
parent | Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers'... (diff) | |
download | linux-f93d1be217d89f258f0108a8cd64b98cb8fa9e73.tar.xz linux-f93d1be217d89f258f0108a8cd64b98cb8fa9e73.zip |
regmap: Move spinlock_flags into the union
This patch move struct regmap.spinlock_flags into the union of
spinlock, so that we can shrink struct regmap size.
Signed-off-by: Yalin Wang <yalin.wang@sonymobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/regmap/internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 0da5865df5b1..8e94584b0d26 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -51,9 +51,11 @@ struct regmap_async { struct regmap { union { struct mutex mutex; - spinlock_t spinlock; + struct { + spinlock_t spinlock; + unsigned long spinlock_flags; + }; }; - unsigned long spinlock_flags; regmap_lock lock; regmap_unlock unlock; void *lock_arg; /* This is passed to lock/unlock functions */ |