]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: soc-utils: replace platform to component
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 29 Jan 2018 02:40:52 +0000 (02:40 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Feb 2018 11:45:07 +0000 (11:45 +0000)
Now platform can be replaced to component, let's do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-utils.c

index bcd3da2739e20d5db3b9a52d185b357150369de0..e237858c9ed4683b1bb63e23646075c2ab9fd839 100644 (file)
@@ -284,7 +284,7 @@ static const struct snd_pcm_ops dummy_dma_ops = {
        .ioctl          = snd_pcm_lib_ioctl,
 };
 
-static const struct snd_soc_platform_driver dummy_platform = {
+static const struct snd_soc_component_driver dummy_platform = {
        .ops = &dummy_dma_ops,
 };
 
@@ -342,7 +342,8 @@ static int snd_soc_dummy_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_register_platform(&pdev->dev, &dummy_platform);
+       ret = devm_snd_soc_register_component(&pdev->dev, &dummy_platform,
+                                             NULL, 0);
        if (ret < 0) {
                snd_soc_unregister_codec(&pdev->dev);
                return ret;
@@ -353,7 +354,6 @@ static int snd_soc_dummy_probe(struct platform_device *pdev)
 
 static int snd_soc_dummy_remove(struct platform_device *pdev)
 {
-       snd_soc_unregister_platform(&pdev->dev);
        snd_soc_unregister_codec(&pdev->dev);
 
        return 0;