Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94ed234 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove 'reg_size' field from snd_soc_codec struct 



The reg_size field is calculated in snd_soc_register_codec() and then used
exactly once in snd_soc_flat_cache_init(). Since it is calculated based on other
fields from the codec struct just move the calculation to
snd_soc_flat_cache_init() and remove the 'reg_size' field from the codec struct.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b012aa61

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -662,7 +662,6 @@ struct snd_soc_codec { 
	struct list_head card_list;

	int num_dai;

	enum snd_soc_compress_type compress_type;

	size_t reg_size;	/* reg_cache_size * reg_word_size */

	int (*volatile_register)(struct snd_soc_codec *, unsigned int);

	int (*readable_register)(struct snd_soc_codec *, unsigned int);

	int (*writable_register)(struct snd_soc_codec *, unsigned int);

sound/soc/soc-cache.c

+5 −2
Original line number Diff line number Diff line
@@ -122,12 +122,15 @@ static int snd_soc_flat_cache_exit(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 = codec->driver;

	size_t reg_size;



	reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;



	if (codec_drv->reg_cache_default)

		codec->reg_cache = kmemdup(codec_drv->reg_cache_default,

					   codec->reg_size, GFP_KERNEL);

					   reg_size, GFP_KERNEL);

	else

		codec->reg_cache = kzalloc(codec->reg_size, GFP_KERNEL);

		codec->reg_cache = kzalloc(reg_size, GFP_KERNEL);

	if (!codec->reg_cache)

		return -ENOMEM;

sound/soc/soc-core.c

+0 −7
Original line number Diff line number Diff line
@@ -4159,7 +4159,6 @@ int snd_soc_register_codec(struct device *dev, 
			   struct snd_soc_dai_driver *dai_drv,

			   int num_dai)

{

	size_t reg_size;

	struct snd_soc_codec *codec;

	int ret, i;
@@ -4197,12 +4196,6 @@ int snd_soc_register_codec(struct device *dev, 
	codec->num_dai = num_dai;

	mutex_init(&codec->mutex);



	/* allocate CODEC register cache */

	if (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;

	}



	for (i = 0; i < num_dai; i++) {

		fixup_codec_formats(&dai_drv[i].playback);

		fixup_codec_formats(&dai_drv[i].capture);