Merge branch 'postmerge' into for-linus

[firefly-linux-kernel-4.4.55.git] / sound / soc / sh / ssi.c

diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index c8e73a7039348e7818b15bacb95b1e6e6268b856..e889405ebd385db5143b9aa63d2479f529035331 100644 (file)
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -379,15 +379,19 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
 #endif
 };
 
+static const struct snd_soc_component_driver sh4_ssi_component = {
+       .name           = "sh4-ssi",
+};
+
 static int sh4_soc_dai_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai,
-                       ARRAY_SIZE(sh4_ssi_dai));
+       return snd_soc_register_component(&pdev->dev, &sh4_ssi_component,
+                                         sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai));
 }
 
 static int sh4_soc_dai_remove(struct platform_device *pdev)
 {
-       snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+       snd_soc_unregister_component(&pdev->dev);
        return 0;
 }