UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: sunxi: sun4i-codec: use snd_soc_dai_link_component for aux_dev 

We can use snd_soc_dai_link_component to specify aux_dev.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k1bo6w9b.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:25 +09:00 committed by Mark Brown
parent 124749194a
commit 3d0d2d64b7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/sunxi/sun4i-codec.c
View File

@ -1424,7 +1424,7 @@ static const struct snd_soc_dapm_route sun8i_codec_card_routes[] = {
}; };
static struct snd_soc_aux_dev aux_dev = { static struct snd_soc_aux_dev aux_dev = {
.name = "Codec Analog Controls", .dlc = COMP_EMPTY(),
}; };
static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev) static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev)
@ -1436,10 +1436,10 @@ static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev)
if (!card) if (!card)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
aux_dev.codec_of_node = of_parse_phandle(dev->of_node, aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
"allwinner,codec-analog-controls", "allwinner,codec-analog-controls",
0); 0);
if (!aux_dev.codec_of_node) { if (!aux_dev.dlc.of_node) {
dev_err(dev, "Can't find analog controls for codec.\n"); dev_err(dev, "Can't find analog controls for codec.\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
}; };
@ -1474,10 +1474,10 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev)
if (!card) if (!card)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
aux_dev.codec_of_node = of_parse_phandle(dev->of_node, aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
"allwinner,codec-analog-controls", "allwinner,codec-analog-controls",
0); 0);
if (!aux_dev.codec_of_node) { if (!aux_dev.dlc.of_node) {
dev_err(dev, "Can't find analog controls for codec.\n"); dev_err(dev, "Can't find analog controls for codec.\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
}; };
@ -1512,10 +1512,10 @@ static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev)
if (!card) if (!card)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
aux_dev.codec_of_node = of_parse_phandle(dev->of_node, aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
"allwinner,codec-analog-controls", "allwinner,codec-analog-controls",
0); 0);
if (!aux_dev.codec_of_node) { if (!aux_dev.dlc.of_node) {
dev_err(dev, "Can't find analog controls for codec.\n"); dev_err(dev, "Can't find analog controls for codec.\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
}; };