From bbe7d6c924bc8cc3b6578fcf946656bfe0f47fa0 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 27 Sep 2011 20:15:37 +0200 Subject: [PATCH] --- yaml --- r: 266997 b: refs/heads/master c: c5713004b304e89c8c5117d8f226d5a1603571dc h: refs/heads/master i: 266995: 853d0a40acda34b4edc95e218a3204504957f6d4 v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regcache-rbtree.c | 35 ++------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/[refs] b/[refs] index 261ae56358b6..0478b6780900 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954757d767a78bc4b863fa9ea703bd7f814c8a55 +refs/heads/master: c5713004b304e89c8c5117d8f226d5a1603571dc diff --git a/trunk/drivers/base/regmap/regcache-rbtree.c b/trunk/drivers/base/regmap/regcache-rbtree.c index dd1b937a0d84..52669dec73b3 100644 --- a/trunk/drivers/base/regmap/regcache-rbtree.c +++ b/trunk/drivers/base/regmap/regcache-rbtree.c @@ -46,45 +46,14 @@ static unsigned int regcache_rbtree_get_register( struct regcache_rbtree_node *rbnode, unsigned int idx, unsigned int word_size) { - unsigned int val; - - switch (word_size) { - case 1: { - u8 *p = rbnode->block; - val = p[idx]; - return val; - } - case 2: { - u16 *p = rbnode->block; - val = p[idx]; - return val; - } - default: - BUG(); - break; - } - return -1; + return regcache_get_val(rbnode->block, idx, word_size); } static void regcache_rbtree_set_register(struct regcache_rbtree_node *rbnode, unsigned int idx, unsigned int val, unsigned int word_size) { - switch (word_size) { - case 1: { - u8 *p = rbnode->block; - p[idx] = val; - break; - } - case 2: { - u16 *p = rbnode->block; - p[idx] = val; - break; - } - default: - BUG(); - break; - } + regcache_set_val(rbnode->block, idx, val, word_size); } static struct regcache_rbtree_node *regcache_rbtree_lookup(