From: Wang, Yalin <Yalin.Wang@sonymobile.com>
Date: Mon, 15 Dec 2014 08:05:50 +0000 (+0800)
Subject: regmap: Move spinlock_flags into the union
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f93d1be217d89f258f0108a8cd64b98cb8fa9e73;p=linux-beck.git

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>
---

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 */