From dd060bc92748ce77231b2cd2657510b77cd94dea Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 16 Aug 2014 12:30:58 +0100 Subject: regmap: Restore L: linux-kernel@vger.kernel.org entry As with commit 981c3a4ff85 (MAINTAINERS: Restore "L: linux-kernel@vger.kernel.org" entries) restore the mailing list entry for the regmap framework in order to assist users in finding the list if they read the file instead of using get_maintainers.pl. Signed-off-by: Mark Brown --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index aefa94841ff3..0bb827ac690b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7550,6 +7550,7 @@ F: fs/reiserfs/ REGISTER MAP ABSTRACTION M: Mark Brown +L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git S: Supported F: drivers/base/regmap/ -- cgit v1.2.1 From 9ba1e456e1fa3729fc6be73403a7b2083f9590eb Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 17 Aug 2014 12:08:57 +0200 Subject: regmap: Add explicit dependencies to catch "select" misuse Add explicit dependencies for the various regmap modules, so Kconfig will print a warning message when another module selects a regmap module without fulfilling its dependencies. Without this, it's much more difficult to find out which module did the offending select. Signed-off-by: Geert Uytterhoeven Signed-off-by: Mark Brown --- drivers/base/regmap/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index 4251570610c9..8a3f51f7b1b9 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -11,12 +11,15 @@ config REGMAP config REGMAP_I2C tristate + depends on I2C config REGMAP_SPI tristate + depends on SPI config REGMAP_SPMI tristate + depends on SPMI config REGMAP_MMIO tristate -- cgit v1.2.1 From 336fb81b319ec4d5c09aa6417de7c042cfcd7461 Mon Sep 17 00:00:00 2001 From: "Wang, Yalin" Date: Thu, 11 Sep 2014 16:19:49 +0800 Subject: regmap: change struct regmap's internal locks as union this patch change struct regmap->mutex and struct regmap->spinlock as an union, because these 2 members are only used one of them, we change it to shrink the struct size. Signed-off-by: Yalin Wang Signed-off-by: Mark Brown --- drivers/base/regmap/internal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 7d1326985bee..f82e8faa5d93 100644 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@ -49,8 +49,10 @@ struct regmap_async { }; struct regmap { - struct mutex mutex; - spinlock_t spinlock; + union { + struct mutex mutex; + spinlock_t spinlock; + }; unsigned long spinlock_flags; regmap_lock lock; regmap_unlock unlock; -- cgit v1.2.1