Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc7d7b83 authored by Mark Brown's avatar Mark Brown
Browse files

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

include/sound/soc-dai.h

+2 −4
Original line number Diff line number Diff line
@@ -191,10 +191,8 @@ struct snd_soc_dai { 
		     struct snd_soc_dai *dai);

	void (*remove)(struct platform_device *pdev,

		       struct snd_soc_dai *dai);

	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);



	/* ops */

	struct snd_soc_dai_ops ops;

sound/soc/atmel/atmel_ssc_dai.c

+2 −4
Original line number Diff line number Diff line
@@ -628,8 +628,7 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, 




#ifdef CONFIG_PM

static int atmel_ssc_suspend(struct platform_device *pdev,

			    struct snd_soc_dai *cpu_dai)

static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai)

{

	struct atmel_ssc_info *ssc_p;
@@ -657,8 +656,7 @@ static int atmel_ssc_suspend(struct platform_device *pdev, 






static int atmel_ssc_resume(struct platform_device *pdev,

			   struct snd_soc_dai *cpu_dai)

static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)

{

	struct atmel_ssc_info *ssc_p;

	u32 cr;

sound/soc/au1x/psc-ac97.c

+2 −4
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ static void au1xpsc_ac97_remove(struct platform_device *pdev, 
	au1xpsc_ac97_workdata = NULL;

}



static int au1xpsc_ac97_suspend(struct platform_device *pdev,

				struct snd_soc_dai *dai)

static int au1xpsc_ac97_suspend(struct snd_soc_dai *dai)

{

	/* save interesting registers and disable PSC */

	au1xpsc_ac97_workdata->pm[0] =
@@ -329,8 +328,7 @@ static int au1xpsc_ac97_suspend(struct platform_device *pdev, 
	return 0;

}



static int au1xpsc_ac97_resume(struct platform_device *pdev,

			       struct snd_soc_dai *dai)

static int au1xpsc_ac97_resume(struct snd_soc_dai *dai)

{

	/* restore PSC clock config */

	au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE,

sound/soc/au1x/psc-i2s.c

+2 −4
Original line number Diff line number Diff line
@@ -339,8 +339,7 @@ static void au1xpsc_i2s_remove(struct platform_device *pdev, 
	au1xpsc_i2s_workdata = NULL;

}



static int au1xpsc_i2s_suspend(struct platform_device *pdev,

			       struct snd_soc_dai *cpu_dai)

static int au1xpsc_i2s_suspend(struct snd_soc_dai *cpu_dai)

{

	/* save interesting register and disable PSC */

	au1xpsc_i2s_workdata->pm[0] =
@@ -354,8 +353,7 @@ static int au1xpsc_i2s_suspend(struct platform_device *pdev, 
	return 0;

}



static int au1xpsc_i2s_resume(struct platform_device *pdev,

			      struct snd_soc_dai *cpu_dai)

static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai)

{

	/* select I2S mode and PSC clock */

	au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata));

sound/soc/blackfin/bf5xx-ac97.c

+2 −4
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = { 
EXPORT_SYMBOL_GPL(soc_ac97_ops);



#ifdef CONFIG_PM

static int bf5xx_ac97_suspend(struct platform_device *pdev,

	struct snd_soc_dai *dai)

static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)

{

	struct sport_device *sport =

		(struct sport_device *)dai->private_data;
@@ -285,8 +284,7 @@ static int bf5xx_ac97_suspend(struct platform_device *pdev, 
	return 0;

}



static int bf5xx_ac97_resume(struct platform_device *pdev,

	struct snd_soc_dai *dai)

static int bf5xx_ac97_resume(struct snd_soc_dai *dai)

{

	int ret;

	struct sport_device *sport =