| Message ID | 1399361981-18518-4-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | db88a8e3ca38b840c768e65a3ddb952cf1bf258f |
| Headers | show |
On Tue, May 06, 2014 at 09:39:39AM +0200, Lars-Peter Clausen wrote: > Commit d191bd8de8 ("ASoC: snd_soc_codec includes snd_soc_component") removed the > last user of the num_dai field. Also remove the field itself. Applied, thanks.
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5603020..f046dcf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -692,7 +692,6 @@ struct snd_soc_codec { struct snd_soc_card *card; struct list_head list; struct list_head card_list; - int num_dai; /* runtime */ struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cc62526..f32b3f2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4265,7 +4265,6 @@ int snd_soc_register_codec(struct device *dev, codec->dapm.stream_event = codec_drv->stream_event; codec->dev = dev; codec->driver = codec_drv; - codec->num_dai = num_dai; codec->component.val_bytes = codec_drv->reg_word_size; mutex_init(&codec->mutex);
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> --- include/sound/soc.h | 1 - sound/soc/soc-core.c | 1 - 2 files changed, 2 deletions(-)