Commit 21385a4f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: samsung: 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.

This patch moves DAI driver .suspend/.resume to Component driver
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wo9nx7it.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ef20061a
...@@ -1024,14 +1024,14 @@ i2s_delay(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) ...@@ -1024,14 +1024,14 @@ i2s_delay(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int i2s_suspend(struct snd_soc_dai *dai) static int i2s_suspend(struct snd_soc_component *component)
{ {
return pm_runtime_force_suspend(dai->dev); return pm_runtime_force_suspend(component->dev);
} }
static int i2s_resume(struct snd_soc_dai *dai) static int i2s_resume(struct snd_soc_component *component)
{ {
return pm_runtime_force_resume(dai->dev); return pm_runtime_force_resume(component->dev);
} }
#else #else
#define i2s_suspend NULL #define i2s_suspend NULL
...@@ -1140,6 +1140,9 @@ static const struct snd_soc_component_driver samsung_i2s_component = { ...@@ -1140,6 +1140,9 @@ static const struct snd_soc_component_driver samsung_i2s_component = {
.dapm_routes = samsung_i2s_dapm_routes, .dapm_routes = samsung_i2s_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(samsung_i2s_dapm_routes), .num_dapm_routes = ARRAY_SIZE(samsung_i2s_dapm_routes),
.suspend = i2s_suspend,
.resume = i2s_resume,
}; };
#define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \ #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \
...@@ -1171,8 +1174,6 @@ static int i2s_alloc_dais(struct samsung_i2s_priv *priv, ...@@ -1171,8 +1174,6 @@ static int i2s_alloc_dais(struct samsung_i2s_priv *priv,
dai_drv->probe = samsung_i2s_dai_probe; dai_drv->probe = samsung_i2s_dai_probe;
dai_drv->remove = samsung_i2s_dai_remove; dai_drv->remove = samsung_i2s_dai_remove;
dai_drv->suspend = i2s_suspend;
dai_drv->resume = i2s_resume;
dai_drv->symmetric_rates = 1; dai_drv->symmetric_rates = 1;
dai_drv->ops = &samsung_i2s_dai_ops; dai_drv->ops = &samsung_i2s_dai_ops;
......
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