lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: soc-cache: Add reg_size as a member to snd_soc_codec

Browse Source 
Simplify the use of reg_size, by calculating it once and storing it in
the codec structure for later reference.  The value of reg_size is
reg_cache_size * reg_word_size.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dimitris Papastamos
2011-01-12 10:38:58 +00:00
committed by Mark Brown
parent d779fce5d7
commit aea170a099
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc.h
View File

@@ -459,6 +459,7 @@ struct snd_soc_codec {
struct list_head card_list; struct list_head card_list;
int num_dai; int num_dai;
enum snd_soc_compress_type compress_type; enum snd_soc_compress_type compress_type;
size_t reg_size; /* reg_cache_size * reg_word_size */
/* runtime */ /* runtime */
struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */

26
sound/soc/soc-cache.c
View File

@@ -1100,34 +1100,28 @@ static inline int snd_soc_lzo_get_blkindex(struct snd_soc_codec *codec,
unsigned int reg) unsigned int reg)
{ {
const struct snd_soc_codec_driver *codec_drv; const struct snd_soc_codec_driver *codec_drv;
size_t reg_size;
codec_drv = codec->driver; codec_drv = codec->driver;
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
return (reg * codec_drv->reg_word_size) / return (reg * codec_drv->reg_word_size) /
DIV_ROUND_UP(reg_size, snd_soc_lzo_block_count()); DIV_ROUND_UP(codec->reg_size, snd_soc_lzo_block_count());
} }
static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec, static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec,
unsigned int reg) unsigned int reg)
{ {
const struct snd_soc_codec_driver *codec_drv; const struct snd_soc_codec_driver *codec_drv;
size_t reg_size;
codec_drv = codec->driver; codec_drv = codec->driver;
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size; return reg % (DIV_ROUND_UP(codec->reg_size, snd_soc_lzo_block_count()) /
return reg % (DIV_ROUND_UP(reg_size, snd_soc_lzo_block_count()) /
codec_drv->reg_word_size); codec_drv->reg_word_size);
} }
static inline int snd_soc_lzo_get_blksize(struct snd_soc_codec *codec) static inline int snd_soc_lzo_get_blksize(struct snd_soc_codec *codec)
{ {
const struct snd_soc_codec_driver *codec_drv; const struct snd_soc_codec_driver *codec_drv;
size_t reg_size;
codec_drv = codec->driver; codec_drv = codec->driver;
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size; return DIV_ROUND_UP(codec->reg_size, snd_soc_lzo_block_count());
return DIV_ROUND_UP(reg_size, snd_soc_lzo_block_count());
} }
static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec) static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec)
@@ -1287,7 +1281,7 @@ static int snd_soc_lzo_cache_exit(struct snd_soc_codec *codec)
static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec) static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec)
{ {
struct snd_soc_lzo_ctx **lzo_blocks; struct snd_soc_lzo_ctx **lzo_blocks;
size_t reg_size, bmp_size; size_t bmp_size;
const struct snd_soc_codec_driver *codec_drv; const struct snd_soc_codec_driver *codec_drv;
int ret, tofree, i, blksize, blkcount; int ret, tofree, i, blksize, blkcount;
const char *p, *end; const char *p, *end;
@@ -1295,7 +1289,6 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec)
ret = 0; ret = 0;
codec_drv = codec->driver; codec_drv = codec->driver;
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
/* /*
* If we have not been given a default register cache * If we have not been given a default register cache
@@ -1307,8 +1300,7 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec)
tofree = 1; tofree = 1;
if (!codec->reg_def_copy) { if (!codec->reg_def_copy) {
codec->reg_def_copy = kzalloc(reg_size, codec->reg_def_copy = kzalloc(codec->reg_size, GFP_KERNEL);
GFP_KERNEL);
if (!codec->reg_def_copy) if (!codec->reg_def_copy)
return -ENOMEM; return -ENOMEM;
} }
@@ -1356,7 +1348,7 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec)
blksize = snd_soc_lzo_get_blksize(codec); blksize = snd_soc_lzo_get_blksize(codec);
p = codec->reg_def_copy; p = codec->reg_def_copy;
end = codec->reg_def_copy + reg_size; end = codec->reg_def_copy + codec->reg_size;
/* compress the register map and fill the lzo blocks */ /* compress the register map and fill the lzo blocks */
for (i = 0; i < blkcount; ++i, p += blksize) { for (i = 0; i < blkcount; ++i, p += blksize) {
lzo_blocks[i]->src = p; lzo_blocks[i]->src = p;
@@ -1441,16 +1433,14 @@ static int snd_soc_flat_cache_exit(struct snd_soc_codec *codec)
static int snd_soc_flat_cache_init(struct snd_soc_codec *codec) static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
{ {
const struct snd_soc_codec_driver *codec_drv; const struct snd_soc_codec_driver *codec_drv;
size_t reg_size;
codec_drv = codec->driver; codec_drv = codec->driver;
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
if (codec->reg_def_copy) if (codec->reg_def_copy)
codec->reg_cache = kmemdup(codec->reg_def_copy, codec->reg_cache = kmemdup(codec->reg_def_copy,
reg_size, GFP_KERNEL); codec->reg_size, GFP_KERNEL);
else else
codec->reg_cache = kzalloc(reg_size, GFP_KERNEL); codec->reg_cache = kzalloc(codec->reg_size, GFP_KERNEL);
if (!codec->reg_cache) if (!codec->reg_cache)
return -ENOMEM; return -ENOMEM;

1
sound/soc/soc-core.c
View File

@@ -3500,6 +3500,7 @@ int snd_soc_register_codec(struct device *dev,
/* allocate CODEC register cache */ /* allocate CODEC register cache */
if (codec_drv->reg_cache_size && codec_drv->reg_word_size) { if (codec_drv->reg_cache_size && codec_drv->reg_word_size) {
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size; reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
codec->reg_size = reg_size;
/* it is necessary to make a copy of the default register cache /* it is necessary to make a copy of the default register cache
* because in the case of using a compression type that requires * because in the case of using a compression type that requires
* the default register cache to be marked as __devinitconst the * the default register cache to be marked as __devinitconst the