From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>, Liam Girdwood <lrg@ti.com>
Subject: [PATCH 4/5] regmap: Remove redundant member `word_size' from regcache_rbtree_node
Date: Tue, 27 Sep 2011 11:25:07 +0100 [thread overview]
Message-ID: <1317119108-15338-5-git-send-email-dp@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1317119108-15338-1-git-send-email-dp@opensource.wolfsonmicro.com>
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
drivers/base/regmap/regcache-rbtree.c | 53 ++++++++++++++++++--------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 4d7ba45..dd1b937 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -23,8 +23,6 @@ struct regcache_rbtree_node {
struct rb_node node;
/* base register handled by this block */
unsigned int base_reg;
- /* number of bytes needed to represent the register index */
- unsigned int word_size;
/* block of adjacent registers */
void *block;
/* number of registers available in the block */
@@ -45,11 +43,12 @@ static inline void regcache_rbtree_get_base_top_reg(
}
static unsigned int regcache_rbtree_get_register(
- struct regcache_rbtree_node *rbnode, unsigned int idx)
+ struct regcache_rbtree_node *rbnode, unsigned int idx,
+ unsigned int word_size)
{
unsigned int val;
- switch (rbnode->word_size) {
+ switch (word_size) {
case 1: {
u8 *p = rbnode->block;
val = p[idx];
@@ -68,9 +67,10 @@ static unsigned int regcache_rbtree_get_register(
}
static void regcache_rbtree_set_register(struct regcache_rbtree_node *rbnode,
- unsigned int idx, unsigned int val)
+ unsigned int idx, unsigned int val,
+ unsigned int word_size)
{
- switch (rbnode->word_size) {
+ switch (word_size) {
case 1: {
u8 *p = rbnode->block;
p[idx] = val;
@@ -217,7 +217,8 @@ static int regcache_rbtree_read(struct regmap *map,
regcache_rbtree_get_base_top_reg(rbnode, &base_reg, &top_reg);
if (reg >= base_reg && reg <= top_reg) {
reg_tmp = reg - base_reg;
- *value = regcache_rbtree_get_register(rbnode, reg_tmp);
+ *value = regcache_rbtree_get_register(rbnode, reg_tmp,
+ map->cache_word_size);
return 0;
}
}
@@ -227,7 +228,8 @@ static int regcache_rbtree_read(struct regmap *map,
rbnode = regcache_rbtree_lookup(&rbtree_ctx->root, reg);
if (rbnode) {
reg_tmp = reg - rbnode->base_reg;
- *value = regcache_rbtree_get_register(rbnode, reg_tmp);
+ *value = regcache_rbtree_get_register(rbnode, reg_tmp,
+ map->cache_word_size);
rbtree_ctx->cached_rbnode = rbnode;
} else {
/* uninitialized registers default to 0 */
@@ -240,19 +242,19 @@ static int regcache_rbtree_read(struct regmap *map,
static int regcache_rbtree_insert_to_block(struct regcache_rbtree_node *rbnode,
unsigned int pos, unsigned int reg,
- unsigned int value)
+ unsigned int value, unsigned int word_size)
{
u8 *blk;
blk = krealloc(rbnode->block,
- (rbnode->blklen + 1) * rbnode->word_size, GFP_KERNEL);
+ (rbnode->blklen + 1) * word_size, GFP_KERNEL);
if (!blk)
return -ENOMEM;
/* insert the register value in the correct place in the rbnode block */
- memmove(blk + (pos + 1) * rbnode->word_size,
- blk + pos * rbnode->word_size,
- (rbnode->blklen - pos) * rbnode->word_size);
+ memmove(blk + (pos + 1) * word_size,
+ blk + pos * word_size,
+ (rbnode->blklen - pos) * word_size);
/* update the rbnode block, its size and the base register */
rbnode->block = blk;
@@ -260,7 +262,7 @@ static int regcache_rbtree_insert_to_block(struct regcache_rbtree_node *rbnode,
if (!pos)
rbnode->base_reg = reg;
- regcache_rbtree_set_register(rbnode, pos, value);
+ regcache_rbtree_set_register(rbnode, pos, value, word_size);
return 0;
}
@@ -284,10 +286,12 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
regcache_rbtree_get_base_top_reg(rbnode, &base_reg, &top_reg);
if (reg >= base_reg && reg <= top_reg) {
reg_tmp = reg - base_reg;
- val = regcache_rbtree_get_register(rbnode, reg_tmp);
+ val = regcache_rbtree_get_register(rbnode, reg_tmp,
+ map->cache_word_size);
if (val == value)
return 0;
- regcache_rbtree_set_register(rbnode, reg_tmp, value);
+ regcache_rbtree_set_register(rbnode, reg_tmp, value,
+ map->cache_word_size);
return 0;
}
}
@@ -297,10 +301,12 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
rbnode = regcache_rbtree_lookup(&rbtree_ctx->root, reg);
if (rbnode) {
reg_tmp = reg - rbnode->base_reg;
- val = regcache_rbtree_get_register(rbnode, reg_tmp);
+ val = regcache_rbtree_get_register(rbnode, reg_tmp,
+ map->cache_word_size);
if (val == value)
return 0;
- regcache_rbtree_set_register(rbnode, reg_tmp, value);
+ regcache_rbtree_set_register(rbnode, reg_tmp, value,
+ map->cache_word_size);
rbtree_ctx->cached_rbnode = rbnode;
} else {
/* bail out early, no need to create the rbnode yet */
@@ -320,7 +326,8 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
else
pos = i;
ret = regcache_rbtree_insert_to_block(rbnode_tmp, pos,
- reg, value);
+ reg, value,
+ map->cache_word_size);
if (ret)
return ret;
rbtree_ctx->cached_rbnode = rbnode_tmp;
@@ -337,14 +344,13 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
return -ENOMEM;
rbnode->blklen = 1;
rbnode->base_reg = reg;
- rbnode->word_size = map->cache_word_size;
- rbnode->block = kmalloc(rbnode->blklen * rbnode->word_size,
+ rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size,
GFP_KERNEL);
if (!rbnode->block) {
kfree(rbnode);
return -ENOMEM;
}
- regcache_rbtree_set_register(rbnode, 0, value);
+ regcache_rbtree_set_register(rbnode, 0, value, map->cache_word_size);
regcache_rbtree_insert(&rbtree_ctx->root, rbnode);
rbtree_ctx->cached_rbnode = rbnode;
}
@@ -367,7 +373,8 @@ static int regcache_rbtree_sync(struct regmap *map)
rbnode = rb_entry(node, struct regcache_rbtree_node, node);
for (i = 0; i < rbnode->blklen; i++) {
regtmp = rbnode->base_reg + i;
- val = regcache_rbtree_get_register(rbnode, i);
+ val = regcache_rbtree_get_register(rbnode, i,
+ map->cache_word_size);
ret = regcache_lookup_reg(map, i);
if (ret < 0)
def = 0;
--
1.7.6.4
next prev parent reply other threads:[~2011-09-27 10:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-27 10:25 [PATCH 0/5] regcache updates Dimitris Papastamos
2011-09-27 10:25 ` [PATCH 1/5] regmap: Fix signed/unsigned comparison Dimitris Papastamos
2011-09-27 12:27 ` Mark Brown
2011-09-27 10:25 ` [PATCH 2/5] regmap: Implement regcache_cache_bypass helper function Dimitris Papastamos
2011-09-27 19:10 ` Mark Brown
2011-09-27 10:25 ` [PATCH 3/5] regmap: Implement generic syncing functionality Dimitris Papastamos
2011-09-27 19:08 ` Mark Brown
2011-09-27 10:25 ` Dimitris Papastamos [this message]
2011-09-27 19:07 ` [PATCH 4/5] regmap: Remove redundant member `word_size' from regcache_rbtree_node Mark Brown
2011-09-27 19:08 ` Mark Brown
2011-09-27 10:25 ` [PATCH 5/5] regmap: Ensure we scream if we enable cache bypass/only at the same time Dimitris Papastamos
2011-09-27 12:28 ` Mark Brown
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=1317119108-15338-5-git-send-email-dp@opensource.wolfsonmicro.com \
--to=dp@opensource.wolfsonmicro.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.