diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-06 03:39:39 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-07 05:21:26 -0400 |
commit | db88a8e3ca38b840c768e65a3ddb952cf1bf258f (patch) | |
tree | aa535de929adf489177ea085645d56fc0f26836b | |
parent | af0881ffbd7bfc825c2871c79798d66e3608a50c (diff) |
ASoC: Remove unused num_dai field from CODEC
Commit d191bd8de8 ("ASoC: snd_soc_codec includes snd_soc_component") removed the
last user of the num_dai field. Also remove the field itself.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | include/sound/soc.h | 1 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 7287c6e0cf71..b9ee22018352 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -701,7 +701,6 @@ struct snd_soc_codec { | |||
701 | struct snd_soc_card *card; | 701 | struct snd_soc_card *card; |
702 | struct list_head list; | 702 | struct list_head list; |
703 | struct list_head card_list; | 703 | struct list_head card_list; |
704 | int num_dai; | ||
705 | 704 | ||
706 | /* runtime */ | 705 | /* runtime */ |
707 | struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ | 706 | struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0a2c0720fc2d..a675eec64756 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -4277,7 +4277,6 @@ int snd_soc_register_codec(struct device *dev, | |||
4277 | codec->dapm.stream_event = codec_drv->stream_event; | 4277 | codec->dapm.stream_event = codec_drv->stream_event; |
4278 | codec->dev = dev; | 4278 | codec->dev = dev; |
4279 | codec->driver = codec_drv; | 4279 | codec->driver = codec_drv; |
4280 | codec->num_dai = num_dai; | ||
4281 | codec->component.val_bytes = codec_drv->reg_word_size; | 4280 | codec->component.val_bytes = codec_drv->reg_word_size; |
4282 | mutex_init(&codec->mutex); | 4281 | mutex_init(&codec->mutex); |
4283 | 4282 | ||