]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: spdif_receiver: replace codec to component
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 29 Jan 2018 04:22:25 +0000 (04:22 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Feb 2018 09:55:31 +0000 (09:55 +0000)
Now we can replace Codec to Component. Let's do it.

Note:
xxx_codec_xxx() -> xxx_component_xxx()
.idle_bias_off = 0 -> .idle_bias_on = 1
.ignore_pmdown_time = 0 -> .use_pmdown_time = 1
- -> .endianness = 1
- -> .non_legacy_dai_naming = 1

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

index c8fd6367f6c00976e73108dfebcb41ad6cbafba7..ac69d495d1219cbc36e682b1fe0b36246a876b49 100644 (file)
@@ -38,13 +38,15 @@ static const struct snd_soc_dapm_route dir_routes[] = {
                        SNDRV_PCM_FMTBIT_S32_LE | \
                        SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
 
-static struct snd_soc_codec_driver soc_codec_spdif_dir = {
-       .component_driver = {
-               .dapm_widgets           = dir_widgets,
-               .num_dapm_widgets       = ARRAY_SIZE(dir_widgets),
-               .dapm_routes            = dir_routes,
-               .num_dapm_routes        = ARRAY_SIZE(dir_routes),
-       },
+static struct snd_soc_component_driver soc_codec_spdif_dir = {
+       .dapm_widgets           = dir_widgets,
+       .num_dapm_widgets       = ARRAY_SIZE(dir_widgets),
+       .dapm_routes            = dir_routes,
+       .num_dapm_routes        = ARRAY_SIZE(dir_routes),
+       .idle_bias_on           = 1,
+       .use_pmdown_time        = 1,
+       .endianness             = 1,
+       .non_legacy_dai_naming  = 1,
 };
 
 static struct snd_soc_dai_driver dir_stub_dai = {
@@ -60,16 +62,11 @@ static struct snd_soc_dai_driver dir_stub_dai = {
 
 static int spdif_dir_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_codec(&pdev->dev, &soc_codec_spdif_dir,
+       return devm_snd_soc_register_component(&pdev->dev,
+                       &soc_codec_spdif_dir,
                        &dir_stub_dai, 1);
 }
 
-static int spdif_dir_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_codec(&pdev->dev);
-       return 0;
-}
-
 #ifdef CONFIG_OF
 static const struct of_device_id spdif_dir_dt_ids[] = {
        { .compatible = "linux,spdif-dir", },
@@ -80,7 +77,6 @@ MODULE_DEVICE_TABLE(of, spdif_dir_dt_ids);
 
 static struct platform_driver spdif_dir_driver = {
        .probe          = spdif_dir_probe,
-       .remove         = spdif_dir_remove,
        .driver         = {
                .name   = "spdif-dir",
                .of_match_table = of_match_ptr(spdif_dir_dt_ids),