aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-01-30 15:08:16 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-11-05 20:27:39 +0000
commit88d4b8a68967090fd4e7e85b59fa0e2fd9a38965 (patch)
tree568d0e9d4013bdabdacb6dd701b095d06bb5f452 /drivers/base
parenta7b97034f762c24849a507fda181dc47198a7f48 (diff)
downloadkernel_samsung_smdk4412-88d4b8a68967090fd4e7e85b59fa0e2fd9a38965.zip
kernel_samsung_smdk4412-88d4b8a68967090fd4e7e85b59fa0e2fd9a38965.tar.gz
kernel_samsung_smdk4412-88d4b8a68967090fd4e7e85b59fa0e2fd9a38965.tar.bz2
regmap: if format_write is used, declare all registers as "unreadable"
commit 4191f19792bf91267835eb090d970e9cd6277a65 upstream. Using .format_write means, we have a custom function to write to the chip, but not to read back. Also, mark registers as "not precious" and "not volatile" which is implicit because we cannot read them. Make those functions use 'regmap_readable' to reuse the checks done there. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bf441db..f8be34d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -36,6 +36,9 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
if (map->max_register && reg > map->max_register)
return false;
+ if (map->format.format_write)
+ return false;
+
if (map->readable_reg)
return map->readable_reg(map->dev, reg);
@@ -44,7 +47,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
bool regmap_volatile(struct regmap *map, unsigned int reg)
{
- if (map->max_register && reg > map->max_register)
+ if (!regmap_readable(map, reg))
return false;
if (map->volatile_reg)
@@ -55,7 +58,7 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
bool regmap_precious(struct regmap *map, unsigned int reg)
{
- if (map->max_register && reg > map->max_register)
+ if (!regmap_readable(map, reg))
return false;
if (map->precious_reg)