From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
To: linux-kernel@vger.kernel.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Graeme Gregory <gg@slimlogic.co.uk>,
Samuel Oritz <sameo@linux.intel.com>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 7/8] regmap: It is impossible to be given a NULL defaults cache
Date: Fri, 2 Sep 2011 16:46:14 +0100 [thread overview]
Message-ID: <1314978375-11539-8-git-send-email-dp@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1314978375-11539-1-git-send-email-dp@opensource.wolfsonmicro.com>
In the new regcache API, it is impossible to hand a NULL defaults
cache to any of the cache compression types.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
drivers/base/regmap/regcache-lzo.c | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 9e0d7be..18e1a8c 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -125,32 +125,17 @@ static int regcache_lzo_init(struct regmap *map)
{
struct regcache_lzo_ctx **lzo_blocks;
size_t bmp_size;
- int ret, tofree, i, blksize, blkcount;
+ int ret, i, blksize, blkcount;
const char *p, *end;
unsigned long *sync_bmp;
ret = 0;
- /*
- * If we have not been given a default register cache
- * then allocate a dummy zero-ed out region, compress it
- * and remember to free it afterwards.
- */
- tofree = 0;
- if (!map->cache_defaults_raw) {
- map->cache_defaults_raw = kzalloc(map->cache_size_raw, GFP_KERNEL);
- if (!map->cache_defaults_raw)
- return -ENOMEM;
- tofree = 1;
- }
-
blkcount = regcache_lzo_block_count();
map->cache = kzalloc(blkcount * sizeof *lzo_blocks,
GFP_KERNEL);
- if (!map->cache) {
- ret = -ENOMEM;
- goto err_tofree;
- }
+ if (!map->cache)
+ return -ENOMEM;
lzo_blocks = map->cache;
/*
@@ -203,18 +188,9 @@ static int regcache_lzo_init(struct regmap *map)
lzo_blocks[i]->src_len;
}
- if (tofree) {
- kfree(map->cache_defaults_raw);
- map->cache_defaults_raw = NULL;
- }
return 0;
err:
regcache_exit(map);
-err_tofree:
- if (tofree) {
- kfree(map->cache_defaults_raw);
- map->cache_defaults_raw = NULL;
- }
return ret;
}
--
1.7.6.1
next prev parent reply other threads:[~2011-09-02 15:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-02 15:46 [PATCH 0/8] Introduce caching support for regmap Dimitris Papastamos
2011-09-02 15:46 ` [PATCH 1/8] regmap: Introduce caching support Dimitris Papastamos
2011-09-02 20:02 ` Lars-Peter Clausen
2011-09-02 23:48 ` Mark Brown
2011-09-03 1:10 ` Dimitris Papastamos
2011-09-04 15:57 ` Mark Brown
2011-09-05 9:44 ` Dimitris Papastamos
2011-09-05 9:43 ` Dimitris Papastamos
2011-09-05 9:55 ` Lars-Peter Clausen
2011-09-05 10:00 ` Dimitris Papastamos
2011-09-02 15:46 ` [PATCH 2/8] regmap: Add the indexed cache support Dimitris Papastamos
2011-09-02 20:16 ` Lars-Peter Clausen
2011-09-05 9:55 ` Dimitris Papastamos
2011-09-05 10:14 ` Lars-Peter Clausen
2011-09-05 18:22 ` Mark Brown
2012-07-17 11:16 ` Mark Brown
2012-07-17 14:24 ` Lars-Peter Clausen
2011-09-02 15:46 ` [PATCH 3/8] regmap: Add the rbtree " Dimitris Papastamos
2011-09-02 20:22 ` Lars-Peter Clausen
2011-09-05 9:58 ` Dimitris Papastamos
2011-09-02 15:46 ` [PATCH 4/8] regmap: Add the LZO " Dimitris Papastamos
2011-09-05 21:40 ` Matthieu CASTET
2011-09-07 19:19 ` Mark Brown
2011-09-02 15:46 ` [PATCH 5/8] regmap: Add the regcache_sync trace event Dimitris Papastamos
2011-09-02 15:46 ` [PATCH 6/8] regmap: Incorporate the regcache core into regmap Dimitris Papastamos
2011-09-02 15:46 ` Dimitris Papastamos [this message]
2011-09-02 15:46 ` [PATCH 8/8] regmap: Support NULL cache_defaults_raw Dimitris Papastamos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314978375-11539-8-git-send-email-dp@opensource.wolfsonmicro.com \
--to=dp@opensource.wolfsonmicro.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=gg@slimlogic.co.uk \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox