Commit 019ea01b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: sh: rsnd: replace platform to component

Now platform can be replaced to component, let's do it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 540b925a
...@@ -1337,7 +1337,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod, ...@@ -1337,7 +1337,7 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
} }
/* /*
* snd_soc_platform * snd_soc_component
*/ */
#define PREALLOC_BUFFER (32 * 1024) #define PREALLOC_BUFFER (32 * 1024)
...@@ -1364,12 +1364,9 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd) ...@@ -1364,12 +1364,9 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX); PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
} }
static const struct snd_soc_platform_driver rsnd_soc_platform = { static const struct snd_soc_component_driver rsnd_soc_component = {
.ops = &rsnd_pcm_ops, .ops = &rsnd_pcm_ops,
.pcm_new = rsnd_pcm_new, .pcm_new = rsnd_pcm_new,
};
static const struct snd_soc_component_driver rsnd_soc_component = {
.name = "rsnd", .name = "rsnd",
}; };
...@@ -1478,17 +1475,11 @@ static int rsnd_probe(struct platform_device *pdev) ...@@ -1478,17 +1475,11 @@ static int rsnd_probe(struct platform_device *pdev)
/* /*
* asoc register * asoc register
*/ */
ret = snd_soc_register_platform(dev, &rsnd_soc_platform); ret = devm_snd_soc_register_component(dev, &rsnd_soc_component,
if (ret < 0) {
dev_err(dev, "cannot snd soc register\n");
return ret;
}
ret = snd_soc_register_component(dev, &rsnd_soc_component,
priv->daidrv, rsnd_rdai_nr(priv)); priv->daidrv, rsnd_rdai_nr(priv));
if (ret < 0) { if (ret < 0) {
dev_err(dev, "cannot snd dai register\n"); dev_err(dev, "cannot snd dai register\n");
goto exit_snd_soc; goto exit_snd_probe;
} }
pm_runtime_enable(dev); pm_runtime_enable(dev);
...@@ -1496,8 +1487,6 @@ static int rsnd_probe(struct platform_device *pdev) ...@@ -1496,8 +1487,6 @@ static int rsnd_probe(struct platform_device *pdev)
dev_info(dev, "probed\n"); dev_info(dev, "probed\n");
return ret; return ret;
exit_snd_soc:
snd_soc_unregister_platform(dev);
exit_snd_probe: exit_snd_probe:
for_each_rsnd_dai(rdai, priv, i) { for_each_rsnd_dai(rdai, priv, i) {
rsnd_dai_call(remove, &rdai->playback, priv); rsnd_dai_call(remove, &rdai->playback, priv);
...@@ -1535,9 +1524,6 @@ static int rsnd_remove(struct platform_device *pdev) ...@@ -1535,9 +1524,6 @@ static int rsnd_remove(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(remove_func); i++) for (i = 0; i < ARRAY_SIZE(remove_func); i++)
remove_func[i](priv); remove_func[i](priv);
snd_soc_unregister_component(&pdev->dev);
snd_soc_unregister_platform(&pdev->dev);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment