OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: xtfpga-i2s: replace platform to component

Browse Source 
Now platform can be replaced to component, let's do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 02:49:25 +00:00 committed by Mark Brown
parent 17d619da7b
commit 80f23c295b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/xtensa/xtfpga-i2s.c
View File

@ -483,13 +483,10 @@ static const struct snd_pcm_ops xtfpga_pcm_ops = {
.pointer = xtfpga_pcm_pointer, .pointer = xtfpga_pcm_pointer,
}; };
static const struct snd_soc_platform_driver xtfpga_soc_platform = {
.pcm_new = xtfpga_pcm_new,
.ops = &xtfpga_pcm_ops,
};
static const struct snd_soc_component_driver xtfpga_i2s_component = { static const struct snd_soc_component_driver xtfpga_i2s_component = {
.name = DRV_NAME, .name = DRV_NAME,
.pcm_new = xtfpga_pcm_new,
.ops = &xtfpga_pcm_ops,
}; };
static const struct snd_soc_dai_ops xtfpga_i2s_dai_ops = { static const struct snd_soc_dai_ops xtfpga_i2s_dai_ops = {
@ -591,18 +588,13 @@ static int xtfpga_i2s_probe(struct platform_device *pdev)
goto err; goto err;
} }
err = snd_soc_register_platform(&pdev->dev, &xtfpga_soc_platform);
if (err < 0) {
dev_err(&pdev->dev, "couldn't register platform\n");
goto err;
}
err = devm_snd_soc_register_component(&pdev->dev, err = devm_snd_soc_register_component(&pdev->dev,
&xtfpga_i2s_component, &xtfpga_i2s_component,
xtfpga_i2s_dai, xtfpga_i2s_dai,
ARRAY_SIZE(xtfpga_i2s_dai)); ARRAY_SIZE(xtfpga_i2s_dai));
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "couldn't register component\n"); dev_err(&pdev->dev, "couldn't register component\n");
goto err_unregister_platform; goto err;
} }
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
@ -615,8 +607,6 @@ static int xtfpga_i2s_probe(struct platform_device *pdev)
err_pm_disable: err_pm_disable:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
err_unregister_platform:
snd_soc_unregister_platform(&pdev->dev);
err: err:
dev_err(&pdev->dev, "%s: err = %d\n", __func__, err); dev_err(&pdev->dev, "%s: err = %d\n", __func__, err);
return err; return err;
@ -626,7 +616,6 @@ static int xtfpga_i2s_remove(struct platform_device *pdev)
{ {
struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev); struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev);
snd_soc_unregister_platform(&pdev->dev);
if (i2s->regmap && !IS_ERR(i2s->regmap)) { if (i2s->regmap && !IS_ERR(i2s->regmap)) {
regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0); regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0);
regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0); regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0);