]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regmap: if format_write is used, declare all registers as "unreadable"
authorWolfram Sang <w.sang@pengutronix.de>
Mon, 30 Jan 2012 14:08:16 +0000 (15:08 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 5 Nov 2014 20:27:39 +0000 (20:27 +0000)
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>
drivers/base/regmap/regmap.c

index bf441db1ee90af507ac3597e6a32dd1a3cbfec10..f8be34d338d0b93eb713a42084bc4e81f65f3d68 100644 (file)
@@ -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)