Commit dd63a9c2 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: Remove snd_soc_platform_driver suspend/resume callbacks

Those are unused and new drivers should use device driver suspend/resume.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7077148f
...@@ -857,8 +857,6 @@ struct snd_soc_platform_driver { ...@@ -857,8 +857,6 @@ struct snd_soc_platform_driver {
int (*probe)(struct snd_soc_platform *); int (*probe)(struct snd_soc_platform *);
int (*remove)(struct snd_soc_platform *); int (*remove)(struct snd_soc_platform *);
int (*suspend)(struct snd_soc_dai *dai);
int (*resume)(struct snd_soc_dai *dai);
struct snd_soc_component_driver component_driver; struct snd_soc_component_driver component_driver;
/* pcm creation and destruction */ /* pcm creation and destruction */
...@@ -891,8 +889,6 @@ struct snd_soc_platform { ...@@ -891,8 +889,6 @@ struct snd_soc_platform {
struct device *dev; struct device *dev;
const struct snd_soc_platform_driver *driver; const struct snd_soc_platform_driver *driver;
unsigned int suspended:1; /* platform is suspended */
struct list_head list; struct list_head list;
struct snd_soc_component component; struct snd_soc_component component;
......
...@@ -592,17 +592,12 @@ int snd_soc_suspend(struct device *dev) ...@@ -592,17 +592,12 @@ int snd_soc_suspend(struct device *dev)
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++) {
struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
struct snd_soc_platform *platform = card->rtd[i].platform;
if (card->rtd[i].dai_link->ignore_suspend) if (card->rtd[i].dai_link->ignore_suspend)
continue; continue;
if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control) if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control)
cpu_dai->driver->suspend(cpu_dai); cpu_dai->driver->suspend(cpu_dai);
if (platform->driver->suspend && !platform->suspended) {
platform->driver->suspend(cpu_dai);
platform->suspended = 1;
}
} }
/* close any waiting streams and save state */ /* close any waiting streams and save state */
...@@ -775,17 +770,12 @@ static void soc_resume_deferred(struct work_struct *work) ...@@ -775,17 +770,12 @@ static void soc_resume_deferred(struct work_struct *work)
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++) {
struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
struct snd_soc_platform *platform = card->rtd[i].platform;
if (card->rtd[i].dai_link->ignore_suspend) if (card->rtd[i].dai_link->ignore_suspend)
continue; continue;
if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control) if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control)
cpu_dai->driver->resume(cpu_dai); cpu_dai->driver->resume(cpu_dai);
if (platform->driver->resume && platform->suspended) {
platform->driver->resume(cpu_dai);
platform->suspended = 0;
}
} }
if (card->resume_post) if (card->resume_post)
......
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