Commit 0b1c8994 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: pxa: pxa2xx-i2s: move .suspend/.resume to component

There is no big difference at implementation for .suspend/.resume
between DAI driver and Component driver.
But because some driver is using DAI version, thus ALSA SoC needs
to keep supporting it, hence, framework becoming verbose.
If we can switch all DAI driver .suspend/.resume to Component driver,
we can remove verbose code from ALSA SoC.

Driver is getting its private data via dai->dev.
But dai->dev and component->dev are same dev, thus, we can convert
these. For same reason, we can convert dai->active to
component->active if necessary.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87sgkbx7ic.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2c55f0be
...@@ -261,7 +261,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, ...@@ -261,7 +261,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) static int pxa2xx_soc_pcm_suspend(struct snd_soc_component *component)
{ {
/* store registers */ /* store registers */
pxa_i2s.sacr0 = SACR0; pxa_i2s.sacr0 = SACR0;
...@@ -275,7 +275,7 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) ...@@ -275,7 +275,7 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai)
return 0; return 0;
} }
static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) static int pxa2xx_soc_pcm_resume(struct snd_soc_component *component)
{ {
pxa_i2s_wait(); pxa_i2s_wait();
...@@ -290,8 +290,8 @@ static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) ...@@ -290,8 +290,8 @@ static int pxa2xx_i2s_resume(struct snd_soc_dai *dai)
} }
#else #else
#define pxa2xx_i2s_suspend NULL #define pxa2xx_soc_pcm_suspend NULL
#define pxa2xx_i2s_resume NULL #define pxa2xx_soc_pcm_resume NULL
#endif #endif
static int pxa2xx_i2s_probe(struct snd_soc_dai *dai) static int pxa2xx_i2s_probe(struct snd_soc_dai *dai)
...@@ -342,8 +342,6 @@ static const struct snd_soc_dai_ops pxa_i2s_dai_ops = { ...@@ -342,8 +342,6 @@ static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
static struct snd_soc_dai_driver pxa_i2s_dai = { static struct snd_soc_dai_driver pxa_i2s_dai = {
.probe = pxa2xx_i2s_probe, .probe = pxa2xx_i2s_probe,
.remove = pxa2xx_i2s_remove, .remove = pxa2xx_i2s_remove,
.suspend = pxa2xx_i2s_suspend,
.resume = pxa2xx_i2s_resume,
.playback = { .playback = {
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
...@@ -370,6 +368,8 @@ static const struct snd_soc_component_driver pxa_i2s_component = { ...@@ -370,6 +368,8 @@ static const struct snd_soc_component_driver pxa_i2s_component = {
.trigger = pxa2xx_soc_pcm_trigger, .trigger = pxa2xx_soc_pcm_trigger,
.pointer = pxa2xx_soc_pcm_pointer, .pointer = pxa2xx_soc_pcm_pointer,
.mmap = pxa2xx_soc_pcm_mmap, .mmap = pxa2xx_soc_pcm_mmap,
.suspend = pxa2xx_soc_pcm_suspend,
.resume = pxa2xx_soc_pcm_resume,
}; };
static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
......
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