regmap: Remove indexed cache type
There should be no situation where it offers any advantage over rbtree and there are no current users so remove the code for simplicity. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
b44d48c1cc
commit
4c69166458
5 changed files with 1 additions and 89 deletions
|
@ -1,4 +1,4 @@
|
||||||
obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o
|
obj-$(CONFIG_REGMAP) += regmap.o regcache.o
|
||||||
obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
|
obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
|
||||||
obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
|
obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
|
||||||
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
||||||
|
|
|
@ -119,10 +119,7 @@ unsigned int regcache_get_val(const void *base, unsigned int idx,
|
||||||
bool regcache_set_val(void *base, unsigned int idx,
|
bool regcache_set_val(void *base, unsigned int idx,
|
||||||
unsigned int val, unsigned int word_size);
|
unsigned int val, unsigned int word_size);
|
||||||
int regcache_lookup_reg(struct regmap *map, unsigned int reg);
|
int regcache_lookup_reg(struct regmap *map, unsigned int reg);
|
||||||
int regcache_insert_reg(struct regmap *map, unsigned int reg,
|
|
||||||
unsigned int val);
|
|
||||||
|
|
||||||
extern struct regcache_ops regcache_indexed_ops;
|
|
||||||
extern struct regcache_ops regcache_rbtree_ops;
|
extern struct regcache_ops regcache_rbtree_ops;
|
||||||
extern struct regcache_ops regcache_lzo_ops;
|
extern struct regcache_ops regcache_lzo_ops;
|
||||||
|
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
/*
|
|
||||||
* Register cache access API - indexed caching support
|
|
||||||
*
|
|
||||||
* Copyright 2011 Wolfson Microelectronics plc
|
|
||||||
*
|
|
||||||
* Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
#include "internal.h"
|
|
||||||
|
|
||||||
static int regcache_indexed_read(struct regmap *map, unsigned int reg,
|
|
||||||
unsigned int *value)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = regcache_lookup_reg(map, reg);
|
|
||||||
if (ret >= 0)
|
|
||||||
*value = map->reg_defaults[ret].def;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int regcache_indexed_write(struct regmap *map, unsigned int reg,
|
|
||||||
unsigned int value)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = regcache_lookup_reg(map, reg);
|
|
||||||
if (ret < 0)
|
|
||||||
return regcache_insert_reg(map, reg, value);
|
|
||||||
map->reg_defaults[ret].def = value;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int regcache_indexed_sync(struct regmap *map)
|
|
||||||
{
|
|
||||||
unsigned int i;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
for (i = 0; i < map->num_reg_defaults; i++) {
|
|
||||||
ret = _regmap_write(map, map->reg_defaults[i].reg,
|
|
||||||
map->reg_defaults[i].def);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
dev_dbg(map->dev, "Synced register %#x, value %#x\n",
|
|
||||||
map->reg_defaults[i].reg,
|
|
||||||
map->reg_defaults[i].def);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct regcache_ops regcache_indexed_ops = {
|
|
||||||
.type = REGCACHE_INDEXED,
|
|
||||||
.name = "indexed",
|
|
||||||
.read = regcache_indexed_read,
|
|
||||||
.write = regcache_indexed_write,
|
|
||||||
.sync = regcache_indexed_sync
|
|
||||||
};
|
|
|
@ -19,7 +19,6 @@
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
static const struct regcache_ops *cache_types[] = {
|
static const struct regcache_ops *cache_types[] = {
|
||||||
®cache_indexed_ops,
|
|
||||||
®cache_rbtree_ops,
|
®cache_rbtree_ops,
|
||||||
®cache_lzo_ops,
|
®cache_lzo_ops,
|
||||||
};
|
};
|
||||||
|
@ -420,22 +419,3 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)
|
||||||
else
|
else
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
int regcache_insert_reg(struct regmap *map, unsigned int reg,
|
|
||||||
unsigned int val)
|
|
||||||
{
|
|
||||||
void *tmp;
|
|
||||||
|
|
||||||
tmp = krealloc(map->reg_defaults,
|
|
||||||
(map->num_reg_defaults + 1) * sizeof(struct reg_default),
|
|
||||||
GFP_KERNEL);
|
|
||||||
if (!tmp)
|
|
||||||
return -ENOMEM;
|
|
||||||
map->reg_defaults = tmp;
|
|
||||||
map->num_reg_defaults++;
|
|
||||||
map->reg_defaults[map->num_reg_defaults - 1].reg = reg;
|
|
||||||
map->reg_defaults[map->num_reg_defaults - 1].def = val;
|
|
||||||
sort(map->reg_defaults, map->num_reg_defaults,
|
|
||||||
sizeof(struct reg_default), regcache_default_cmp, NULL);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -23,7 +23,6 @@ struct spi_device;
|
||||||
/* An enum of all the supported cache types */
|
/* An enum of all the supported cache types */
|
||||||
enum regcache_type {
|
enum regcache_type {
|
||||||
REGCACHE_NONE,
|
REGCACHE_NONE,
|
||||||
REGCACHE_INDEXED,
|
|
||||||
REGCACHE_RBTREE,
|
REGCACHE_RBTREE,
|
||||||
REGCACHE_COMPRESSED
|
REGCACHE_COMPRESSED
|
||||||
};
|
};
|
||||||
|
|
Reference in a new issue