3 files changed, 5 insertions, 10 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 62f320f56644..577212629d0f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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);
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index a7f83c0c62ce..9542c83d2295 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -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;
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bbe833ab657e..af9648426f4f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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);