diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-01-27 06:37:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-27 11:59:36 +0000 |
| commit | b07609cecaac6681a2fca3eebc1bae7b00282620 (patch) | |
| tree | 3a4b8ae6452a8bf8bb7756dae2d42616d6108686 /include/sound/soc.h | |
| parent | 440a3006f154a3aca4badf72841c61ac93a72110 (diff) | |
| download | blackbird-op-linux-b07609cecaac6681a2fca3eebc1bae7b00282620.tar.gz blackbird-op-linux-b07609cecaac6681a2fca3eebc1bae7b00282620.zip | |
ASoC: soc-core: remove OF adjusting for snd_soc_of_parse_card_name
Because prototype of OF-graph sound card support didn't have Sound Card
node, commit 8f5ebb1bee15b5720741a98414767bb86f6c2b23
("ASoC: soc-core: adjust for graph on snd_soc_of_parse_card_name")
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 8f5ebb1bee15b5720741a98414767bb86f6c2b23.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 34bd033443dc..6ecabeb8d31d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1644,11 +1644,8 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform( int snd_soc_util_init(void); void snd_soc_util_exit(void); -#define snd_soc_of_parse_card_name(card, propname) \ - snd_soc_of_parse_card_name_from_node(card, NULL, propname) -int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, - struct device_node *np, - const char *propname); +int snd_soc_of_parse_card_name(struct snd_soc_card *card, + 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, |
