ASoC: fsi: use snd_soc_register_component() instead of snd_soc_register_dais()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 14 Mar 2013 07:19:20 +0000 (00:19 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 15 Mar 2013 01:24:57 +0000 (01:24 +0000)
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/sh/fsi.c

index c724026a246f6ec90f80b11dfed4397fee6d7d37..254c6375f7a1ebe890df2f42eae8e0bcd5107de2 100644 (file)
@@ -1886,6 +1886,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
        .pcm_free       = fsi_pcm_free,
 };
 
+static const struct snd_soc_component_driver fsi_soc_component = {
+       .name           = "fsi",
+};
+
 /*
  *             platform function
  */
@@ -2046,10 +2050,10 @@ static int fsi_probe(struct platform_device *pdev)
                goto exit_fsib;
        }
 
-       ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
-                                   ARRAY_SIZE(fsi_soc_dai));
+       ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
+                                   fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
        if (ret < 0) {
-               dev_err(&pdev->dev, "cannot snd dai register\n");
+               dev_err(&pdev->dev, "cannot snd component register\n");
                goto exit_snd_soc;
        }
 
@@ -2074,7 +2078,7 @@ static int fsi_remove(struct platform_device *pdev)
 
        pm_runtime_disable(&pdev->dev);
 
-       snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));
+       snd_soc_unregister_component(&pdev->dev);
        snd_soc_unregister_platform(&pdev->dev);
 
        fsi_stream_remove(&master->fsia);