The patch

   regmap: cache: Add warning info for the cache check

has been applied to the regmap tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 8cfe2fd3562ba673435bb2d7a4bb451aabd47809 Mon Sep 17 00:00:00 2001
From: Xiubo Li <lixi...@cmss.chinamobile.com>
Date: Fri, 11 Dec 2015 11:23:19 +0800
Subject: [PATCH] regmap: cache: Add warning info for the cache check

If there is no cache used for the drivers, the register defaults
or the register defaults raw are not need any more. This patch
will check this and print a warning.

Signed-off-by: Xiubo Li <lixi...@cmss.chinamobile.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/base/regmap/regcache.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 4c07802..9436a0d 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -100,15 +100,19 @@ int regcache_init(struct regmap *map, const struct 
regmap_config *config)
        int i;
        void *tmp_buf;
 
-       for (i = 0; i < config->num_reg_defaults; i++)
-               if (config->reg_defaults[i].reg % map->reg_stride)
-                       return -EINVAL;
-
        if (map->cache_type == REGCACHE_NONE) {
+               if (config->reg_defaults || config->num_reg_defaults_raw)
+                       dev_warn(map->dev,
+                                "No cache used with register defaults set!\n");
+
                map->cache_bypass = true;
                return 0;
        }
 
+       for (i = 0; i < config->num_reg_defaults; i++)
+               if (config->reg_defaults[i].reg % map->reg_stride)
+                       return -EINVAL;
+
        for (i = 0; i < ARRAY_SIZE(cache_types); i++)
                if (cache_types[i]->type == map->cache_type)
                        break;
-- 
2.6.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/

Reply via email to