]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: sunxi: sun4i-codec: use snd_soc_dai_link_component for aux_dev
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 8 Aug 2019 05:54:25 +0000 (14:54 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 9 Aug 2019 17:12:35 +0000 (18:12 +0100)
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>
sound/soc/sunxi/sun4i-codec.c

index 619073e7d97235264ffa06babe1e39a7804a87f1..ee448d5e07a6d2aa394a629c37d271857a9d520e 100644 (file)
@@ -1424,7 +1424,7 @@ static const struct snd_soc_dapm_route sun8i_codec_card_routes[] = {
 };
 
 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)
@@ -1436,10 +1436,10 @@ static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev)
        if (!card)
                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",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };
@@ -1474,10 +1474,10 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev)
        if (!card)
                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",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };
@@ -1512,10 +1512,10 @@ static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev)
        if (!card)
                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",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };