diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-01-28 23:22:25 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-12 04:55:31 -0500 |
commit | 8c6086b8b5e7e50519b6d439ec51ac06a956c656 (patch) | |
tree | 094c89ec4e5d65b65561832f4a52b19a30479372 | |
parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) |
ASoC: spdif_receiver: replace codec to component
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>
-rw-r--r-- | sound/soc/codecs/spdif_receiver.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/sound/soc/codecs/spdif_receiver.c b/sound/soc/codecs/spdif_receiver.c index c8fd6367f6c0..ac69d495d121 100644 --- a/sound/soc/codecs/spdif_receiver.c +++ b/sound/soc/codecs/spdif_receiver.c | |||
@@ -38,13 +38,15 @@ static const struct snd_soc_dapm_route dir_routes[] = { | |||
38 | SNDRV_PCM_FMTBIT_S32_LE | \ | 38 | SNDRV_PCM_FMTBIT_S32_LE | \ |
39 | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) | 39 | SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) |
40 | 40 | ||
41 | static struct snd_soc_codec_driver soc_codec_spdif_dir = { | 41 | static struct snd_soc_component_driver soc_codec_spdif_dir = { |
42 | .component_driver = { | 42 | .dapm_widgets = dir_widgets, |
43 | .dapm_widgets = dir_widgets, | 43 | .num_dapm_widgets = ARRAY_SIZE(dir_widgets), |
44 | .num_dapm_widgets = ARRAY_SIZE(dir_widgets), | 44 | .dapm_routes = dir_routes, |
45 | .dapm_routes = dir_routes, | 45 | .num_dapm_routes = ARRAY_SIZE(dir_routes), |
46 | .num_dapm_routes = ARRAY_SIZE(dir_routes), | 46 | .idle_bias_on = 1, |
47 | }, | 47 | .use_pmdown_time = 1, |
48 | .endianness = 1, | ||
49 | .non_legacy_dai_naming = 1, | ||
48 | }; | 50 | }; |
49 | 51 | ||
50 | static struct snd_soc_dai_driver dir_stub_dai = { | 52 | static struct snd_soc_dai_driver dir_stub_dai = { |
@@ -60,16 +62,11 @@ static struct snd_soc_dai_driver dir_stub_dai = { | |||
60 | 62 | ||
61 | static int spdif_dir_probe(struct platform_device *pdev) | 63 | static int spdif_dir_probe(struct platform_device *pdev) |
62 | { | 64 | { |
63 | return snd_soc_register_codec(&pdev->dev, &soc_codec_spdif_dir, | 65 | return devm_snd_soc_register_component(&pdev->dev, |
66 | &soc_codec_spdif_dir, | ||
64 | &dir_stub_dai, 1); | 67 | &dir_stub_dai, 1); |
65 | } | 68 | } |
66 | 69 | ||
67 | static int spdif_dir_remove(struct platform_device *pdev) | ||
68 | { | ||
69 | snd_soc_unregister_codec(&pdev->dev); | ||
70 | return 0; | ||
71 | } | ||
72 | |||
73 | #ifdef CONFIG_OF | 70 | #ifdef CONFIG_OF |
74 | static const struct of_device_id spdif_dir_dt_ids[] = { | 71 | static const struct of_device_id spdif_dir_dt_ids[] = { |
75 | { .compatible = "linux,spdif-dir", }, | 72 | { .compatible = "linux,spdif-dir", }, |
@@ -80,7 +77,6 @@ MODULE_DEVICE_TABLE(of, spdif_dir_dt_ids); | |||
80 | 77 | ||
81 | static struct platform_driver spdif_dir_driver = { | 78 | static struct platform_driver spdif_dir_driver = { |
82 | .probe = spdif_dir_probe, | 79 | .probe = spdif_dir_probe, |
83 | .remove = spdif_dir_remove, | ||
84 | .driver = { | 80 | .driver = { |
85 | .name = "spdif-dir", | 81 | .name = "spdif-dir", |
86 | .of_match_table = of_match_ptr(spdif_dir_dt_ids), | 82 | .of_match_table = of_match_ptr(spdif_dir_dt_ids), |