diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:10 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:10 +0800 |
| commit | dfdb3c4d18221c5c66a1bfecb76c25b3f95275e8 (patch) | |
| tree | aa5ba637239f5dea2313afd72c586d5489d973a1 /drivers | |
| parent | Linux 3.19-rc7 (diff) | |
| parent | regmap: Move spinlock_flags into the union (diff) | |
| download | linux-dev-dfdb3c4d18221c5c66a1bfecb76c25b3f95275e8.tar.xz linux-dev-dfdb3c4d18221c5c66a1bfecb76c25b3f95275e8.zip | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers')
| -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 */ |