[PATCH 1/2] regmap: core: Warn on invalid operation combinations

[Mark Brown]

Don't grind to a screaming halt, just generate a warning.

Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com>
---
 drivers/base/regmap/regmap.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index fed91ac..e4faed1 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -950,7 +950,7 @@ static int _regmap_raw_write(struct regmap *map, unsigned 
int reg,
        size_t len;
        int i;
 
-       BUG_ON(!map->bus);
+       WARN_ON(!map->bus);
 
        /* Check for unwritable registers before we start */
        if (map->writeable_reg)
@@ -1106,7 +1106,7 @@ static int _regmap_bus_formatted_write(void *context, 
unsigned int reg,
        struct regmap_range_node *range;
        struct regmap *map = context;
 
-       BUG_ON(!map->bus || !map->format.format_write);
+       WARN_ON(!map->bus || !map->format.format_write);
 
        range = _regmap_range_lookup(map, reg);
        if (range) {
@@ -1132,7 +1132,7 @@ static int _regmap_bus_raw_write(void *context, unsigned 
int reg,
 {
        struct regmap *map = context;
 
-       BUG_ON(!map->bus || !map->format.format_val);
+       WARN_ON(!map->bus || !map->format.format_val);
 
        map->format.format_val(map->work_buf + map->format.reg_bytes
                               + map->format.pad_bytes, val, 0);
@@ -1358,7 +1358,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned 
int reg, void *val,
        u8 *u8 = map->work_buf;
        int ret;
 
-       BUG_ON(!map->bus);
+       WARN_ON(!map->bus);
 
        range = _regmap_range_lookup(map, reg);
        if (range) {
@@ -1413,7 +1413,7 @@ static int _regmap_read(struct regmap *map, unsigned int 
reg,
        int ret;
        void *context = _regmap_map_get_context(map);
 
-       BUG_ON(!map->reg_read);
+       WARN_ON(!map->reg_read);
 
        if (!map->cache_bypass) {
                ret = regcache_read(map, reg, val);
-- 
1.7.10.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/