openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-core: remove legacy style of aux_dev 

Now all drivers are using snd_soc_dai_link_component for aux_dev.
Let's remove legacy style

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h86s6w8x.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-08-08 14:54:39 +09:00 committed by Mark Brown
parent 77b21d2822
commit a48b561d87
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sound/soc.h
View File

@ -963,19 +963,10 @@ struct snd_soc_codec_conf {
};
struct snd_soc_aux_dev {
const char *name; /* Codec name */
/*
* specify multi-codec either by device name, or by
* DT/OF node, but not both.
*/
const char *codec_name;
struct device_node *codec_of_node;
/*
* name, codec_name, codec_of_node will be replaced
* into dlc. don't use both in the same time
*/
struct snd_soc_dai_link_component dlc;
/* codec/machine specific init - e.g. add machine controls */

6
sound/soc/soc-core.c
View File

@ -1538,12 +1538,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
struct snd_soc_component *component;
/* remove me */
if (aux_dev->codec_name)
aux_dev->dlc.name = aux_dev->codec_name;
if (aux_dev->codec_of_node)
aux_dev->dlc.of_node = aux_dev->codec_of_node;
/* codecs, usually analog devices */
component = soc_find_component(&aux_dev->dlc);
if (!component)