Skip to content

L
linux
Commit dc7d7b83 authored by Mark Brown's avatar Mark Brown
Browse files
Options

ASoC: Remove platform device from DAI suspend and resume operations 

None of the DAIs use it except s3c2412-i2s which only uses it for
dev_() printouts.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 07c84d04
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 53 deletions
include/sound/soc-dai.h
View file @ dc7d7b83
...@@ -191,10 +191,8 @@ struct snd_soc_dai { ...@@ -191,10 +191,8 @@ struct snd_soc_dai {
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
void (*remove)(struct platform_device *pdev, void (*remove)(struct platform_device *pdev,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
int (*suspend)(struct platform_device *pdev, int (*suspend)(struct snd_soc_dai *dai);
struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai);
int (*resume)(struct platform_device *pdev,
struct snd_soc_dai *dai);
/* ops */ /* ops */
struct snd_soc_dai_ops ops; struct snd_soc_dai_ops ops;
......
sound/soc/atmel/atmel_ssc_dai.c
View file @ dc7d7b83
...@@ -628,8 +628,7 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, ...@@ -628,8 +628,7 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream,
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int atmel_ssc_suspend(struct platform_device *pdev, static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
struct atmel_ssc_info *ssc_p; struct atmel_ssc_info *ssc_p;
...@@ -657,8 +656,7 @@ static int atmel_ssc_suspend(struct platform_device *pdev, ...@@ -657,8 +656,7 @@ static int atmel_ssc_suspend(struct platform_device *pdev,
static int atmel_ssc_resume(struct platform_device *pdev, static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
struct atmel_ssc_info *ssc_p; struct atmel_ssc_info *ssc_p;
u32 cr; u32 cr;
......
sound/soc/au1x/psc-ac97.c
View file @ dc7d7b83
...@@ -314,8 +314,7 @@ static void au1xpsc_ac97_remove(struct platform_device *pdev, ...@@ -314,8 +314,7 @@ static void au1xpsc_ac97_remove(struct platform_device *pdev,
au1xpsc_ac97_workdata = NULL; au1xpsc_ac97_workdata = NULL;
} }
static int au1xpsc_ac97_suspend(struct platform_device *pdev, static int au1xpsc_ac97_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
/* save interesting registers and disable PSC */ /* save interesting registers and disable PSC */
au1xpsc_ac97_workdata->pm[0] = au1xpsc_ac97_workdata->pm[0] =
...@@ -329,8 +328,7 @@ static int au1xpsc_ac97_suspend(struct platform_device *pdev, ...@@ -329,8 +328,7 @@ static int au1xpsc_ac97_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int au1xpsc_ac97_resume(struct platform_device *pdev, static int au1xpsc_ac97_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
/* restore PSC clock config */ /* restore PSC clock config */
au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE, au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE,
......
sound/soc/au1x/psc-i2s.c
View file @ dc7d7b83
...@@ -339,8 +339,7 @@ static void au1xpsc_i2s_remove(struct platform_device *pdev, ...@@ -339,8 +339,7 @@ static void au1xpsc_i2s_remove(struct platform_device *pdev,
au1xpsc_i2s_workdata = NULL; au1xpsc_i2s_workdata = NULL;
} }
static int au1xpsc_i2s_suspend(struct platform_device *pdev, static int au1xpsc_i2s_suspend(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
/* save interesting register and disable PSC */ /* save interesting register and disable PSC */
au1xpsc_i2s_workdata->pm[0] = au1xpsc_i2s_workdata->pm[0] =
...@@ -354,8 +353,7 @@ static int au1xpsc_i2s_suspend(struct platform_device *pdev, ...@@ -354,8 +353,7 @@ static int au1xpsc_i2s_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int au1xpsc_i2s_resume(struct platform_device *pdev, static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
/* select I2S mode and PSC clock */ /* select I2S mode and PSC clock */
au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata));
......
sound/soc/blackfin/bf5xx-ac97.c
View file @ dc7d7b83
...@@ -269,8 +269,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = { ...@@ -269,8 +269,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
EXPORT_SYMBOL_GPL(soc_ac97_ops); EXPORT_SYMBOL_GPL(soc_ac97_ops);
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int bf5xx_ac97_suspend(struct platform_device *pdev, static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct sport_device *sport = struct sport_device *sport =
(struct sport_device *)dai->private_data; (struct sport_device *)dai->private_data;
...@@ -285,8 +284,7 @@ static int bf5xx_ac97_suspend(struct platform_device *pdev, ...@@ -285,8 +284,7 @@ static int bf5xx_ac97_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int bf5xx_ac97_resume(struct platform_device *pdev, static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
int ret; int ret;
struct sport_device *sport = struct sport_device *sport =
......
sound/soc/blackfin/bf5xx-i2s.c
View file @ dc7d7b83
...@@ -222,16 +222,14 @@ static int bf5xx_i2s_probe(struct platform_device *pdev, ...@@ -222,16 +222,14 @@ static int bf5xx_i2s_probe(struct platform_device *pdev,
return 0; return 0;
} }
static void bf5xx_i2s_remove(struct platform_device *pdev, static void bf5xx_i2s_remove(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
pr_debug("%s enter\n", __func__); pr_debug("%s enter\n", __func__);
peripheral_free_list(&sport_req[sport_num][0]); peripheral_free_list(&sport_req[sport_num][0]);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int bf5xx_i2s_suspend(struct platform_device *dev, static int bf5xx_i2s_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct sport_device *sport = struct sport_device *sport =
(struct sport_device *)dai->private_data; (struct sport_device *)dai->private_data;
......
sound/soc/pxa/pxa-ssp.c
View file @ dc7d7b83
...@@ -244,8 +244,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, ...@@ -244,8 +244,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa_ssp_suspend(struct platform_device *pdev, static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
struct ssp_priv *priv = cpu_dai->private_data; struct ssp_priv *priv = cpu_dai->private_data;
...@@ -257,8 +256,7 @@ static int pxa_ssp_suspend(struct platform_device *pdev, ...@@ -257,8 +256,7 @@ static int pxa_ssp_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int pxa_ssp_resume(struct platform_device *pdev, static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
struct ssp_priv *priv = cpu_dai->private_data; struct ssp_priv *priv = cpu_dai->private_data;
......
sound/soc/pxa/pxa2xx-ac97.c
View file @ dc7d7b83
...@@ -87,14 +87,12 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = { ...@@ -87,14 +87,12 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = {
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa2xx_ac97_suspend(struct platform_device *pdev, static int pxa2xx_ac97_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
return pxa2xx_ac97_hw_suspend(); return pxa2xx_ac97_hw_suspend();
} }
static int pxa2xx_ac97_resume(struct platform_device *pdev, static int pxa2xx_ac97_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
return pxa2xx_ac97_hw_resume(); return pxa2xx_ac97_hw_resume();
} }
......
sound/soc/pxa/pxa2xx-i2s.c
View file @ dc7d7b83
...@@ -293,8 +293,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, ...@@ -293,8 +293,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa2xx_i2s_suspend(struct platform_device *dev, static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
if (!dai->active) if (!dai->active)
return 0; return 0;
...@@ -311,8 +310,7 @@ static int pxa2xx_i2s_suspend(struct platform_device *dev, ...@@ -311,8 +310,7 @@ static int pxa2xx_i2s_suspend(struct platform_device *dev,
return 0; return 0;
} }
static int pxa2xx_i2s_resume(struct platform_device *pdev, static int pxa2xx_i2s_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
if (!dai->active) if (!dai->active)
return 0; return 0;
......
sound/soc/s3c24xx/s3c2412-i2s.c
View file @ dc7d7b83
...@@ -649,8 +649,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, ...@@ -649,8 +649,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c2412_i2s_suspend(struct platform_device *dev, static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct s3c2412_i2s_info *i2s = &s3c2412_i2s; struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
u32 iismod; u32 iismod;
...@@ -665,24 +664,23 @@ static int s3c2412_i2s_suspend(struct platform_device *dev, ...@@ -665,24 +664,23 @@ static int s3c2412_i2s_suspend(struct platform_device *dev,
iismod = readl(i2s->regs + S3C2412_IISMOD); iismod = readl(i2s->regs + S3C2412_IISMOD);
if (iismod & S3C2412_IISCON_RXDMA_ACTIVE) if (iismod & S3C2412_IISCON_RXDMA_ACTIVE)
dev_warn(&dev->dev, "%s: RXDMA active?\n", __func__); pr_warning("%s: RXDMA active?\n", __func__);
if (iismod & S3C2412_IISCON_TXDMA_ACTIVE) if (iismod & S3C2412_IISCON_TXDMA_ACTIVE)
dev_warn(&dev->dev, "%s: TXDMA active?\n", __func__); pr_warning("%s: TXDMA active?\n", __func__);
if (iismod & S3C2412_IISCON_IIS_ACTIVE) if (iismod & S3C2412_IISCON_IIS_ACTIVE)
dev_warn(&dev->dev, "%s: IIS active\n", __func__); pr_warning("%s: IIS active\n", __func__);
} }
return 0; return 0;
} }
static int s3c2412_i2s_resume(struct platform_device *pdev, static int s3c2412_i2s_resume(struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{ {
struct s3c2412_i2s_info *i2s = &s3c2412_i2s; struct s3c2412_i2s_info *i2s = &s3c2412_i2s;
dev_info(&pdev->dev, "dai_active %d, IISMOD %08x, IISCON %08x\n", pr_info("dai_active %d, IISMOD %08x, IISCON %08x\n",
dai->active, i2s->suspend_iismod, i2s->suspend_iiscon); dai->active, i2s->suspend_iismod, i2s->suspend_iiscon);
if (dai->active) { if (dai->active) {
......
sound/soc/s3c24xx/s3c24xx-i2s.c
View file @ dc7d7b83
...@@ -419,8 +419,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev, ...@@ -419,8 +419,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev,
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c24xx_i2s_suspend(struct platform_device *pdev, static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
...@@ -434,8 +433,7 @@ static int s3c24xx_i2s_suspend(struct platform_device *pdev, ...@@ -434,8 +433,7 @@ static int s3c24xx_i2s_suspend(struct platform_device *pdev,
return 0; return 0;
} }
static int s3c24xx_i2s_resume(struct platform_device *pdev, static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
struct snd_soc_dai *cpu_dai)
{ {
DBG("Entered %s\n", __func__); DBG("Entered %s\n", __func__);
clk_enable(s3c24xx_i2s.iis_clk); clk_enable(s3c24xx_i2s.iis_clk);
......
sound/soc/soc-core.c
View file @ dc7d7b83
...@@ -650,7 +650,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -650,7 +650,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
for (i = 0; i < card->num_links; i++) { for (i = 0; i < card->num_links; i++) {
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->suspend && !cpu_dai->ac97_control) if (cpu_dai->suspend && !cpu_dai->ac97_control)
cpu_dai->suspend(pdev, cpu_dai); cpu_dai->suspend(cpu_dai);
if (platform->suspend) if (platform->suspend)
platform->suspend(cpu_dai); platform->suspend(cpu_dai);
} }
...@@ -676,7 +676,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -676,7 +676,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
for (i = 0; i < card->num_links; i++) { for (i = 0; i < card->num_links; i++) {
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->suspend && cpu_dai->ac97_control) if (cpu_dai->suspend && cpu_dai->ac97_control)
cpu_dai->suspend(pdev, cpu_dai); cpu_dai->suspend(cpu_dai);
} }
if (card->suspend_post) if (card->suspend_post)
...@@ -712,7 +712,7 @@ static void soc_resume_deferred(struct work_struct *work) ...@@ -712,7 +712,7 @@ static void soc_resume_deferred(struct work_struct *work)
for (i = 0; i < card->num_links; i++) { for (i = 0; i < card->num_links; i++) {
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->resume && cpu_dai->ac97_control) if (cpu_dai->resume && cpu_dai->ac97_control)
cpu_dai->resume(pdev, cpu_dai); cpu_dai->resume(cpu_dai);
} }
if (codec_dev->resume) if (codec_dev->resume)
...@@ -739,7 +739,7 @@ static void soc_resume_deferred(struct work_struct *work) ...@@ -739,7 +739,7 @@ static void soc_resume_deferred(struct work_struct *work)
for (i = 0; i < card->num_links; i++) { for (i = 0; i < card->num_links; i++) {
struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
if (cpu_dai->resume && !cpu_dai->ac97_control) if (cpu_dai->resume && !cpu_dai->ac97_control)
cpu_dai->resume(pdev, cpu_dai); cpu_dai->resume(cpu_dai);
if (platform->resume) if (platform->resume)
platform->resume(cpu_dai); platform->resume(cpu_dai);
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7