Commit 3d0d2d64 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k1bo6w9b.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 12474919
...@@ -1424,7 +1424,7 @@ static const struct snd_soc_dapm_route sun8i_codec_card_routes[] = { ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment