Browse Source

ASoC: soc-utils: 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>
Kuninori Morimoto 7 years ago
parent
commit
03a0ddeda7
1 changed files with 8 additions and 14 deletions
  1. 8 14
      sound/soc/soc-utils.c

+ 8 - 14
sound/soc/soc-utils.c

@@ -288,7 +288,12 @@ static const struct snd_soc_component_driver dummy_platform = {
 	.ops = &dummy_dma_ops,
 	.ops = &dummy_dma_ops,
 };
 };
 
 
-static const struct snd_soc_codec_driver dummy_codec;
+static const struct snd_soc_component_driver dummy_codec = {
+	.idle_bias_on		= 1,
+	.use_pmdown_time	= 1,
+	.endianness		= 1,
+	.non_legacy_dai_naming	= 1,
+};
 
 
 #define STUB_RATES	SNDRV_PCM_RATE_8000_192000
 #define STUB_RATES	SNDRV_PCM_RATE_8000_192000
 #define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S8 | \
 #define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S8 | \
@@ -338,33 +343,22 @@ static int snd_soc_dummy_probe(struct platform_device *pdev)
 {
 {
 	int ret;
 	int ret;
 
 
-	ret = snd_soc_register_codec(&pdev->dev, &dummy_codec, &dummy_dai, 1);
+	ret = devm_snd_soc_register_component(&pdev->dev,
+					      &dummy_codec, &dummy_dai, 1);
 	if (ret < 0)
 	if (ret < 0)
 		return ret;
 		return ret;
 
 
 	ret = devm_snd_soc_register_component(&pdev->dev, &dummy_platform,
 	ret = devm_snd_soc_register_component(&pdev->dev, &dummy_platform,
 					      NULL, 0);
 					      NULL, 0);
-	if (ret < 0) {
-		snd_soc_unregister_codec(&pdev->dev);
-		return ret;
-	}
 
 
 	return ret;
 	return ret;
 }
 }
 
 
-static int snd_soc_dummy_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_codec(&pdev->dev);
-
-	return 0;
-}
-
 static struct platform_driver soc_dummy_driver = {
 static struct platform_driver soc_dummy_driver = {
 	.driver = {
 	.driver = {
 		.name = "snd-soc-dummy",
 		.name = "snd-soc-dummy",
 	},
 	},
 	.probe = snd_soc_dummy_probe,
 	.probe = snd_soc_dummy_probe,
-	.remove = snd_soc_dummy_remove,
 };
 };
 
 
 static struct platform_device *soc_dummy_dev;
 static struct platform_device *soc_dummy_dev;