diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-01-27 07:37:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-27 12:59:36 +0100 |
| commit | 21efde50ca9cba9230d1b1ea54aadbf6d96c4157 (patch) | |
| tree | 0792a2b950586c01ea3e54ac353ec4904e698f4c /include/sound | |
| parent | ASoC: soc-core: remove OF adjusting for snd_soc_of_parse_audio_routing (diff) | |
| download | linux-21efde50ca9cba9230d1b1ea54aadbf6d96c4157.tar.xz linux-21efde50ca9cba9230d1b1ea54aadbf6d96c4157.zip | |
ASoC: soc-core: remove OF adjusting for snd_soc_of_parse_audio_simple_widgets
Because prototype of OF-graph sound card support didn't have Sound Card
node, commit 1ef5bcd57be5c8b31286b7b47828064be25f266b
("ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_simple_widgets")
adjusted to it on each functions.
But final discussion result of ALSA SoC / OF-graph ML, OF-graph sound
card has node. Thus, this commit became no longer needed.
This reverts commit 1ef5bcd57be5c8b31286b7b47828064be25f266b.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 838e03778b58..4dccc4f63f5e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1649,12 +1649,8 @@ void snd_soc_util_exit(void); int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, struct device_node *np, const char *propname); -#define snd_soc_of_parse_audio_simple_widgets(card, propname)\ - snd_soc_of_parse_audio_simple_widgets_from_node(card, NULL, propname) -int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card, - struct device_node *np, - const char *propname); - +int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, + const char *propname); int snd_soc_of_parse_tdm_slot(struct device_node *np, unsigned int *tx_mask, unsigned int *rx_mask, |