ASoC: hdmi-codec: 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>

diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 5672e51..42df579 100644 (file)
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -730,14 +730,16 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component,
        return ret;
 }
 
-static const struct snd_soc_codec_driver hdmi_codec = {
-       .component_driver = {
-               .dapm_widgets           = hdmi_widgets,
-               .num_dapm_widgets       = ARRAY_SIZE(hdmi_widgets),
-               .dapm_routes            = hdmi_routes,
-               .num_dapm_routes        = ARRAY_SIZE(hdmi_routes),
-               .of_xlate_dai_id        = hdmi_of_xlate_dai_id,
-       },
+static const struct snd_soc_component_driver hdmi_driver = {
+       .dapm_widgets           = hdmi_widgets,
+       .num_dapm_widgets       = ARRAY_SIZE(hdmi_widgets),
+       .dapm_routes            = hdmi_routes,
+       .num_dapm_routes        = ARRAY_SIZE(hdmi_routes),
+       .of_xlate_dai_id        = hdmi_of_xlate_dai_id,
+       .idle_bias_on           = 1,
+       .use_pmdown_time        = 1,
+       .endianness             = 1,
+       .non_legacy_dai_naming  = 1,
 };
 
 static int hdmi_codec_probe(struct platform_device *pdev)
@@ -784,10 +786,10 @@ static int hdmi_codec_probe(struct platform_device *pdev)
        if (hcd->spdif)
                hcp->daidrv[i] = hdmi_spdif_dai;
 
-       ret = snd_soc_register_codec(dev, &hdmi_codec, hcp->daidrv,
+       ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv,
                                     dai_count);
        if (ret) {
-               dev_err(dev, "%s: snd_soc_register_codec() failed (%d)\n",
+               dev_err(dev, "%s: snd_soc_register_component() failed (%d)\n",
                        __func__, ret);
                return ret;
        }
@@ -803,7 +805,6 @@ static int hdmi_codec_remove(struct platform_device *pdev)
 
        hcp = dev_get_drvdata(dev);
        kfree(hcp->chmap_info);
-       snd_soc_unregister_codec(dev);
 
        return 0;
 }