From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 2/4] ASoC: Remove device from platform suspend and resume operations
Date: Thu, 4 Dec 2008 11:26:44 +0000 [thread overview]
Message-ID: <1228390006-30338-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1228390006-30338-1-git-send-email-broonie@opensource.wolfsonmicro.com>
None of the platforms are actually using the SoC device so remove it
(only atmel actually has a suspend method).
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
include/sound/soc.h | 6 ++----
sound/soc/atmel/atmel-pcm.c | 6 ++----
sound/soc/soc-core.c | 4 ++--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3ee608d..8ec63c0 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -300,10 +300,8 @@ struct snd_soc_platform {
int (*probe)(struct platform_device *pdev);
int (*remove)(struct platform_device *pdev);
- int (*suspend)(struct platform_device *pdev,
- struct snd_soc_dai *dai);
- int (*resume)(struct platform_device *pdev,
- struct snd_soc_dai *dai);
+ int (*suspend)(struct snd_soc_dai *dai);
+ int (*resume)(struct snd_soc_dai *dai);
/* pcm creation and destruction */
int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index 394412f..8507aa1 100644
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -417,8 +417,7 @@ static void atmel_pcm_free_dma_buffers(struct snd_pcm *pcm)
}
#ifdef CONFIG_PM
-static int atmel_pcm_suspend(struct platform_device *pdev,
- struct snd_soc_dai *dai)
+static int atmel_pcm_suspend(struct snd_soc_dai *dai)
{
struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd;
@@ -442,8 +441,7 @@ static int atmel_pcm_suspend(struct platform_device *pdev,
return 0;
}
-static int atmel_pcm_resume(struct platform_device *pdev,
- struct snd_soc_dai *dai)
+static int atmel_pcm_resume(struct snd_soc_dai *dai)
{
struct snd_pcm_runtime *runtime = dai->runtime;
struct atmel_runtime_data *prtd;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3411439..f83852f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -652,7 +652,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
if (cpu_dai->suspend && !cpu_dai->ac97_control)
cpu_dai->suspend(pdev, cpu_dai);
if (platform->suspend)
- platform->suspend(pdev, cpu_dai);
+ platform->suspend(cpu_dai);
}
/* close any waiting streams and save state */
@@ -741,7 +741,7 @@ static void soc_resume_deferred(struct work_struct *work)
if (cpu_dai->resume && !cpu_dai->ac97_control)
cpu_dai->resume(pdev, cpu_dai);
if (platform->resume)
- platform->resume(pdev, cpu_dai);
+ platform->resume(cpu_dai);
}
if (card->resume_post)
--
1.5.6.5
next prev parent reply other threads:[~2008-12-04 11:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-04 11:25 [PATCH 0/4] ASoC updates Mark Brown
2008-12-04 11:26 ` [PATCH 1/4] ASoC: Push debugfs files out of the snd_soc_device structure Mark Brown
2008-12-04 11:26 ` Mark Brown [this message]
2008-12-04 11:26 ` [PATCH 3/4] ASoC: Remove platform device from DAI suspend and resume operations Mark Brown
2008-12-04 11:26 ` [PATCH 4/4] ASoC: Remove obsolete declaration of struct snd_soc_clock_info Mark Brown
2008-12-04 14:29 ` [PATCH 0/4] ASoC updates Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1228390006-30338-2-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox