ASoC: rockchip: rockchip_max98090: use snd_soc_dai_link_component for aux_dev
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 8 Aug 2019 05:54:05 +0000 (14:54 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 9 Aug 2019 17:12:32 +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/87pnlg6w9v.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_max98090.c

index 1af1147c3da3b1d03dab8d72308de7c23b38596c..7b0c21fa6dca0dea67054e4a61d59ff6bb25a81d 100644 (file)
@@ -160,7 +160,7 @@ static struct snd_soc_dai_link rk_dailink = {
 static int rk_98090_headset_init(struct snd_soc_component *component);
 
 static struct snd_soc_aux_dev rk_98090_headset_dev = {
-       .name = "Headset Chip",
+       .dlc = COMP_EMPTY(),
        .init = rk_98090_headset_init,
 };
 
@@ -226,9 +226,9 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
 
        rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
 
-       rk_98090_headset_dev.codec_of_node = of_parse_phandle(np,
+       rk_98090_headset_dev.dlc.of_node = of_parse_phandle(np,
                        "rockchip,headset-codec", 0);
-       if (!rk_98090_headset_dev.codec_of_node) {
+       if (!rk_98090_headset_dev.dlc.of_node) {
                dev_err(&pdev->dev,
                        "Property 'rockchip,headset-codec' missing/invalid\n");
                return -EINVAL;