regmap: replace regmap_write_bits()

[linux-beck.git] / include / linux / regmap.h

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index e0960b3ff29068b9a434e6527c3c71e71fb7ad91..0744c9fea24cbe637025b63333507c29d7c4cdfb 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -74,6 +74,9 @@ struct reg_sequence {
 #define        regmap_update_bits_check_async(map, reg, mask, val, change)\
        regmap_update_bits_base(map, reg, mask, val, change, true, false)
 
+#define        regmap_write_bits(map, reg, mask, val) \
+       regmap_update_bits_base(map, reg, mask, val, NULL, false, true)
+
 #define        regmap_field_write(field, val) \
        regmap_field_update_bits_base(field, ~0, val, NULL, false, false)
 #define        regmap_field_force_write(field, val) \
@@ -721,8 +724,6 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
 int regmap_update_bits_base(struct regmap *map, unsigned int reg,
                            unsigned int mask, unsigned int val,
                            bool *change, bool async, bool force);
-int regmap_write_bits(struct regmap *map, unsigned int reg,
-                      unsigned int mask, unsigned int val);
 int regmap_get_val_bytes(struct regmap *map);
 int regmap_get_max_register(struct regmap *map);
 int regmap_get_reg_stride(struct regmap *map);
@@ -961,13 +962,6 @@ static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg,
        return -EINVAL;
 }
 
-static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
-                                    unsigned int mask, unsigned int val)
-{
-       WARN_ONCE(1, "regmap API is disabled");
-       return -EINVAL;
-}
-
 static inline int regmap_field_update_bits_base(struct regmap_field *field,
                                        unsigned int mask, unsigned int val,
                                        bool *change, bool async, bool force)