diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-16 18:13:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-21 21:04:24 +0100 |
| commit | f4333203ec933f9272c90c7add01774ec2cf94d3 (patch) | |
| tree | 4a7f0bd37c7a5d00105dd91980fca721e181bee4 /sound/soc/soc-cache.c | |
| parent | 94f99c875c109e51decf0d8c25ec2c946db20c56 (diff) | |
| download | blackbird-obmc-linux-f4333203ec933f9272c90c7add01774ec2cf94d3.tar.gz blackbird-obmc-linux-f4333203ec933f9272c90c7add01774ec2cf94d3.zip | |
ASoC: Move name and id from CODEC/platform to component
The component struct already has a name and id field which are initialized to
the same values as the same fields in the CODEC and platform structs. So remove
them from the CODEC and platform structs and used the ones from the component
struct instead.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-cache.c')
| -rw-r--r-- | sound/soc/soc-cache.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 00e70b6c7da2..a9f82b5aba9d 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -78,7 +78,7 @@ int snd_soc_cache_init(struct snd_soc_codec *codec) mutex_init(&codec->cache_rw_mutex); dev_dbg(codec->dev, "ASoC: Initializing cache for %s codec\n", - codec->name); + codec->component.name); if (codec_drv->reg_cache_default) codec->reg_cache = kmemdup(codec_drv->reg_cache_default, @@ -98,8 +98,7 @@ int snd_soc_cache_init(struct snd_soc_codec *codec) int snd_soc_cache_exit(struct snd_soc_codec *codec) { dev_dbg(codec->dev, "ASoC: Destroying cache for %s codec\n", - codec->name); - + codec->component.name); kfree(codec->reg_cache); codec->reg_cache = NULL; return 0; @@ -192,7 +191,7 @@ int snd_soc_cache_sync(struct snd_soc_codec *codec) return 0; dev_dbg(codec->dev, "ASoC: Syncing cache for %s codec\n", - codec->name); + codec->component.name); trace_snd_soc_cache_sync(codec, name, "start"); ret = snd_soc_flat_cache_sync(codec); if (!ret) |
