[PATCH Resend] regmap: fix _regmap_update_bits()

[Xiubo Li]

Since sometimes the 'config' parameter has no use, it should be NULL.
And make the code simplifier.

Signed-off-by: Xiubo Li <li.xi...@freescale.com>
---

This resend version just rewrites the commit comment.


 drivers/base/regmap/regmap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 6a19515..099522b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1966,9 +1966,11 @@ static int _regmap_update_bits(struct regmap *map, 
unsigned int reg,
 
        if (tmp != orig) {
                ret = _regmap_write(map, reg, tmp);
-               *change = true;
+               if (change)
+                       *change = true;
        } else {
-               *change = false;
+               if (change)
+                       *change = false;
        }
 
        return ret;
@@ -1987,11 +1989,10 @@ static int _regmap_update_bits(struct regmap *map, 
unsigned int reg,
 int regmap_update_bits(struct regmap *map, unsigned int reg,
                       unsigned int mask, unsigned int val)
 {
-       bool change;
        int ret;
 
        map->lock(map->lock_arg);
-       ret = _regmap_update_bits(map, reg, mask, val, &change);
+       ret = _regmap_update_bits(map, reg, mask, val, NULL);
        map->unlock(map->lock_arg);
 
        return ret;
@@ -2016,14 +2017,13 @@ EXPORT_SYMBOL_GPL(regmap_update_bits);
 int regmap_update_bits_async(struct regmap *map, unsigned int reg,
                             unsigned int mask, unsigned int val)
 {
-       bool change;
        int ret;
 
        map->lock(map->lock_arg);
 
        map->async = true;
 
-       ret = _regmap_update_bits(map, reg, mask, val, &change);
+       ret = _regmap_update_bits(map, reg, mask, val, NULL);
 
        map->async = false;
 
-- 
1.8.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/