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

Commit 07c84d04 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove device from platform suspend and resume operations 



None of the platforms are actually using the SoC device so remove it
(only atmel actually has a suspend method).

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 384c89e2

include/sound/soc.h

+2 −4
Original line number Diff line number Diff line
@@ -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 *,

sound/soc/atmel/atmel-pcm.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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)